Corrected attachment name for zip downloads (#54)

* corrected attachment name for zip downloads
estuaryoss · Jan 5, 2022 · 4bbbb8e · 4bbbb8e
1 parent 105ab88
commit 4bbbb8e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,7 @@
 FROM azul/zulu-openjdk:11
 
 ENV APP_DIR /app
-ENV PORT 8443
-ENV HTTPS_ENABLE=true
-ENV SERVICE_PROTOCOL=https
+ENV PORT 8080
 ENV COMMAND_TIMEOUT 1200
 
 RUN mkdir $APP_DIR

diff --git a/src/main/java/com/github/estuaryoss/agent/api/FileApiController.java b/src/main/java/com/github/estuaryoss/agent/api/FileApiController.java
@@ -84,6 +84,7 @@ public ResponseEntity<ApiResponse> fileRead(@ApiParam(value = "Target file path
  .sourceFileName(trimString(file.getName(), FILE_PATH_MAX_SIZE))
  .sourceFilePath(trimString(file.getAbsolutePath(), FILE_PATH_MAX_SIZE))
  .fileSize(resource.contentLength())
+ .dateTime(LocalDateTime.now().format(DateTimeConstants.PATTERN))
  .build());
  } catch (IOException e) {
  throw new ApiException(ApiResponseCode.GET_FILE_FAILURE.getCode(),
@@ -129,6 +130,7 @@ public ResponseEntity<Resource> fileDownload(@ApiParam(value = "Target file path
  .sourceFileName(trimString(file.getName(), FILE_PATH_MAX_SIZE))
  .sourceFilePath(trimString(file.getAbsolutePath(), FILE_PATH_MAX_SIZE))
  .fileSize(resource.contentLength())
+ .dateTime(LocalDateTime.now().format(DateTimeConstants.PATTERN))
  .build());
  } catch (IOException e) {
  throw new ApiException(ApiResponseCode.GET_FILE_FAILURE.getCode(),
@@ -160,6 +162,7 @@ public ResponseEntity<ApiResponse> filePut(@ApiParam(value = "The content of the
  .targetFilePath(trimString(file.getAbsolutePath(), FILE_PATH_MAX_SIZE))
  .targetFolder(trimString(file.getParent(), FILE_PATH_MAX_SIZE))
  .fileSize(content != null ? Long.valueOf(content.length) : 0L)
+ .dateTime(LocalDateTime.now().format(DateTimeConstants.PATTERN))
  .build());
  log.info(String.format("Stored file at '%s'", filePath));
  } catch (IOException e) {
@@ -218,6 +221,7 @@ public ResponseEntity<ApiResponse> filesPut(@RequestPart("files") MultipartFile[
  .targetFilePath(trimString(filePath, FILE_PATH_MAX_SIZE))
  .fileSize(file.getSize())
  .targetFolder(trimString(fPath, FILE_PATH_MAX_SIZE))
+ .dateTime(LocalDateTime.now().format(DateTimeConstants.PATTERN))
  .build());
  log.info(String.format("Stored file '%s' at '%s'", file.getName(), filePath));
  } catch (IOException e) {

diff --git a/src/main/java/com/github/estuaryoss/agent/api/FolderApiController.java b/src/main/java/com/github/estuaryoss/agent/api/FolderApiController.java
@@ -2,10 +2,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.estuaryoss.agent.component.ClientRequest;
-import com.github.estuaryoss.agent.constants.ApiResponseCode;
 import com.github.estuaryoss.agent.constants.ApiResponseMessage;
-import com.github.estuaryoss.agent.constants.DefaultConstants;
-import com.github.estuaryoss.agent.constants.FileTransferType;
+import com.github.estuaryoss.agent.constants.*;
 import com.github.estuaryoss.agent.entity.FileTransfer;
 import com.github.estuaryoss.agent.exception.ApiException;
 import com.github.estuaryoss.agent.service.DbService;
@@ -26,6 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
+import java.time.LocalDateTime;
 
 import static com.github.estuaryoss.agent.constants.HeaderConstants.FOLDER_PATH;
 
@@ -84,14 +83,15 @@ public ResponseEntity<Resource> folderGet(@ApiParam(value = "Target folder path
  .targetFileName(file.getName())
  .targetFilePath(file.getAbsolutePath())
  .fileSize(resource.contentLength())
+ .dateTime(LocalDateTime.now().format(DateTimeConstants.PATTERN))
  .build());
  } catch (IOException e) {
  throw new ApiException(ApiResponseCode.FOLDER_ZIP_FAILURE.getCode(),
  String.format(ApiResponseMessage.getMessage(ApiResponseCode.FOLDER_ZIP_FAILURE.getCode()), folderPath));
  }
 
  return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + sourceFolderPath.getName())
+ .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + file.getName())
  .contentType(MediaType.valueOf("application/zip"))
  .contentLength(resource.contentLength())
  .body(resource);

diff --git a/src/main/java/com/github/estuaryoss/agent/entity/FileTransfer.java b/src/main/java/com/github/estuaryoss/agent/entity/FileTransfer.java
@@ -50,4 +50,7 @@ public class FileTransfer {
 
  @Column(name = "FILE_SIZE")
  private Long fileSize;
+
+ @Column(name = "DATE_TIME", columnDefinition = "TIMESTAMP")
+ private String dateTime;
 }
diff --git a/src/test/java/com/github/estuaryoss/agent/api/CommandApiControllerInBackgroundTest.java b/src/test/java/com/github/estuaryoss/agent/api/CommandApiControllerInBackgroundTest.java
@@ -72,7 +72,7 @@ public void whenSendingBackgroundCommandThenTheUserMustPollActiveAndFinishedEndp
  assertThat(commandList.get(0).getOut().trim()).isEqualTo(stdOut);
  assertThat(commandList.get(0).getErr()).isEqualTo("");
  assertThat(commandList.get(0).getPid()).isGreaterThan(0);
- assertThat(commandList.get(0).getDuration()).isGreaterThan(0);
+ assertThat(commandList.get(0).getDuration()).isGreaterThanOrEqualTo(0);
  }
 
  @Test

diff --git a/src/test/java/com/github/estuaryoss/agent/api/FolderApiControllerTest.java b/src/test/java/com/github/estuaryoss/agent/api/FolderApiControllerTest.java
@@ -75,7 +75,7 @@ public void whenCallingGetThenTheFolderIsRetrievedOkInZipFormat() throws IOExcep
  assertThat(responseEntity.getStatusCode().value()).isEqualTo(HttpStatus.OK.value());
  assertThat(body.contentLength()).isGreaterThan(0L);
  //check also has the required name
- assertThat(body.getFilename()).isEqualTo(folderNameToBeRetrieved);
+ assertThat(body.getFilename()).isEqualTo(folderNameToBeRetrieved + ".zip");
  //audit transfer in DB
  assertThat(fileTransferRepository.findAll().size()).isEqualTo(1);
  }