Add file download name with timestamp

molgenis · Mar 7, 2024 · 03914d5 · 03914d5
1 parent 747ab04
commit 03914d5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/armadillo/src/main/java/org/molgenis/armadillo/controller/InsightController.java b/armadillo/src/main/java/org/molgenis/armadillo/controller/InsightController.java
@@ -111,7 +111,7 @@ public ResponseEntity<Resource> createDownloadFile(String file_id) {
     HttpHeaders headers = new HttpHeaders();
     headers.add(
         HttpHeaders.CONTENT_DISPOSITION,
-        "attachment; filename=\"" + insightService.getFileName(file_id) + "\"");
+        "attachment; filename=\"" + insightService.getDownloadName(file_id) + ".txt\"");
     headers.add(HttpHeaders.CONTENT_TYPE, "text/text");
     return new ResponseEntity<>(inputStreamResource, headers, OK);
   }

diff --git a/armadillo/src/main/java/org/molgenis/armadillo/metadata/InsightService.java b/armadillo/src/main/java/org/molgenis/armadillo/metadata/InsightService.java
@@ -66,6 +66,16 @@ public String getFileName(String file_id) {
     return file_id;
   }
 
+  public String getDownloadName(String file_id) {
+    String requestTime = getServerTime().replace(" ", "T").replace(":", "").replace("-", "");
+
+    InsightServiceFiles c = InsightServiceFiles.getConstantByKey(file_id);
+    if (!(c == null)) {
+      return c.getDownloadName() + "-" + requestTime;
+    }
+    return file_id;
+  }
+
   public FileDetails fileDetails(String file_id, int pageNum, int pageSize, String direction) {
     InsightServiceFiles insightServiceFiles = InsightServiceFiles.getConstantByKey(file_id);
     if (!(insightServiceFiles == null)) {
@@ -92,17 +102,19 @@ public FileInputStream downloadFile(String file_id) {
 }
 
 enum InsightServiceFiles {
-  AUDIT_FILE("AUDIT_FILE", MediaType.APPLICATION_NDJSON_VALUE, "Audit file"),
-  LOG_FILE("LOG_FILE", MediaType.TEXT_PLAIN_VALUE, "Log file");
+  AUDIT_FILE("AUDIT_FILE", MediaType.APPLICATION_NDJSON_VALUE, "Audit file", "armadillo-audit"),
+  LOG_FILE("LOG_FILE", MediaType.TEXT_PLAIN_VALUE, "Log file", "armadillo-log");
 
   private final String key;
   private final String contentType;
   private final String displayName;
+  private final String downloadName;
 
-  InsightServiceFiles(String key, String contentType, String displayName) {
+  InsightServiceFiles(String key, String contentType, String displayName, String downloadName) {
     this.key = key;
     this.contentType = contentType;
     this.displayName = displayName;
+    this.downloadName = downloadName;
   }
 
   public String getKey() {
@@ -117,6 +129,10 @@ public String getDisplayName() {
     return displayName;
   }
 
+  public String getDownloadName() {
+    return downloadName;
+  }
+
   public static boolean hasKey(String key) {
     for (InsightServiceFiles constant : InsightServiceFiles.values()) {
       if (constant.getKey().equals(key)) {