fix download param in html, controller, clean files

yennanliu · Nov 14, 2023 · 69fb996 · 69fb996
1 parent 02d8623
commit 69fb996
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 22 deletions.
diff --git a/springWarehouse/src/main/java/com/yen/springWarehouse/controller/DownloadController.java b/springWarehouse/src/main/java/com/yen/springWarehouse/controller/DownloadController.java
@@ -93,16 +93,13 @@ public String createDownload() {
 
     // TODO : fix : make GET request with report id
     @GetMapping("/download_report")
-    public ResponseEntity<Resource> downloadFile() throws IOException {
+    public ResponseEntity<Resource> downloadFile(String url) throws IOException {
 
-        // Load the file from the classpath (assuming it's in the resources/static directory)
-//        Resource resource = new ClassPathResource("/test.json");
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=test.json");
-
-        List<DownloadStatus> downloadStatusList = downloadStatusMapper.getAllDownloadStatus();
-        // TODO : fix below (currently only get 1st downloadStatus)
-        String downloadUrl = "/report/" + downloadStatusList.get(0).getDownloadUrl();
+        log.info(">>> (ResponseEntity<Resource> downloadFile) url = " + url);
+        //List<DownloadStatus> downloadStatusList = downloadStatusMapper.getAllDownloadStatus();
+        //String downloadUrl = "/report/" + downloadStatusList.get(0).getDownloadUrl();
+        String downloadUrl = "/report/" + url;
+        log.info("downloadUrl = " + downloadUrl);
         Resource resource = new ClassPathResource(downloadUrl);
         HttpHeaders headers = new HttpHeaders();
         headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=%s".format("test.json"));

diff --git a/springWarehouse/src/main/resources/report/20231112-17-15-24_report.json b/springWarehouse/src/main/resources/report/20231112-17-15-24_report.json
diff --git a/springWarehouse/src/main/resources/report/20231112-18-00-25_report.json b/springWarehouse/src/main/resources/report/20231112-18-00-25_report.json
diff --git a/springWarehouse/src/main/resources/report/20231112-18-03-04_report.json b/springWarehouse/src/main/resources/report/20231112-18-03-04_report.json
diff --git a/springWarehouse/src/main/resources/report/20231112-18-13-33_report.json b/springWarehouse/src/main/resources/report/20231112-18-13-33_report.json
diff --git a/springWarehouse/src/main/resources/report/20231112-18-13-35_report.json b/springWarehouse/src/main/resources/report/20231112-18-13-35_report.json
diff --git a/springWarehouse/src/main/resources/report/test_output_2.json b/springWarehouse/src/main/resources/report/test_output_2.json
diff --git a/springWarehouse/src/main/resources/templates/download/list_download.html b/springWarehouse/src/main/resources/templates/download/list_download.html
@@ -27,16 +27,11 @@ <h3 class="title">Report Download</h3>
         <td th:text="${download.id}" nowrap></td>
         <td id="name" th:text="${download.downloadUrl}" nowrap></td>
         <td id="city" th:text="${download.status}" nowrap></td>
-        <!--
-        HTML button send GET or POST request
-        https://stackoverflow.com/questions/46987384/html-form-post-or-get-depending-on-button-clicked
-        -->
         <td>
-            <a href="/download/download_report">
-                <a href="/download/download_report">Download File</a>
+            <a th:href="@{'/download/download_report?url=' + ${download.downloadUrl}}">
+                Download File
             </a>
         </td>
-
     </tr>
 
 </table>