refactor

Signed-off-by: maissa SOUISSI <[email protected]>
powsybl · Jul 17, 2024 · 6b5761c · 6b5761c
1 parent 7438f1d
commit 6b5761c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/powsybl/caseserver/CaseController.java b/src/main/java/com/powsybl/caseserver/CaseController.java
@@ -123,9 +123,10 @@ public ResponseEntity<byte[]> downloadCase(@PathVariable("caseUuid") UUID caseUu
     public ResponseEntity<byte[]> exportCase(
             @PathVariable UUID caseUuid,
             @RequestParam String format,
+            @RequestParam(value = "fileName", required = false) String fileName,
             @RequestBody(required = false) Map<String, Object> formatParameters) throws IOException {
         LOGGER.debug("exportCase request received with parameter caseUuid = {}", caseUuid);
-        return caseService.exportCase(caseUuid, format, formatParameters).map(networkInfos -> {
+        return caseService.exportCase(caseUuid, format, fileName, formatParameters).map(networkInfos -> {
             var headers = new HttpHeaders();
             headers.setContentDisposition(
                     ContentDisposition.builder("attachment")

diff --git a/src/main/java/com/powsybl/caseserver/CaseService.java b/src/main/java/com/powsybl/caseserver/CaseService.java
@@ -408,7 +408,7 @@ Optional<byte[]> getCaseBytes(UUID caseUuid) {
         return Optional.empty();
     }
 
-    public Optional<ExportCaseInfos> exportCase(UUID caseUuid, String format, Map<String, Object> formatParameters) throws IOException {
+    public Optional<ExportCaseInfos> exportCase(UUID caseUuid, String format, String fileName, Map<String, Object> formatParameters) throws IOException {
         if (!Exporter.getFormats().contains(format)) {
             throw CaseException.createUnsupportedFormat(format);
         }
@@ -426,17 +426,17 @@ public Optional<ExportCaseInfos> exportCase(UUID caseUuid, String format, Map<St
             network.write(format, exportProperties, memDataSource);
 
             var listNames = memDataSource.listNames(".*");
-            String networkName = DataSourceUtil.getBaseName(getCaseName(caseUuid));
+            String fileOrNetworkName = fileName != null ? fileName : DataSourceUtil.getBaseName(getCaseName(caseUuid));
             byte[] networkData;
             if (listNames.size() == 1) {
                 String extension = listNames.iterator().next();
-                networkName += extension;
+                fileOrNetworkName += extension;
                 networkData = memDataSource.getData(extension);
             } else {
-                networkName += ".zip";
+                fileOrNetworkName += ".zip";
                 networkData = createZipFile(listNames, memDataSource);
             }
-            return Optional.of(new ExportCaseInfos(networkName, networkData));
+            return Optional.of(new ExportCaseInfos(fileOrNetworkName, networkData));
         } else {
             return Optional.empty();
         }