From 93b531c1712870571abb5ff4abbf554ec2a803ea Mon Sep 17 00:00:00 2001
From: achour94 <berrahmaachour@gmail.com>
Date: Mon, 10 Jun 2024 15:42:57 +0200
Subject: [PATCH 1/3] Fix case names when exported

Signed-off-by: achour94 <berrahmaachour@gmail.com>
---
 src/main/java/com/powsybl/caseserver/CaseService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/powsybl/caseserver/CaseService.java b/src/main/java/com/powsybl/caseserver/CaseService.java
index d051201..3551068 100644
--- a/src/main/java/com/powsybl/caseserver/CaseService.java
+++ b/src/main/java/com/powsybl/caseserver/CaseService.java
@@ -426,7 +426,8 @@ public Optional<ExportCaseInfos> exportCase(UUID caseUuid, String format, Map<St
             network.write(format, exportProperties, memDataSource);
 
             var listNames = memDataSource.listNames(".*");
-            String networkName = FilenameUtils.removeExtension(getCaseName(caseUuid));
+            // the network name corresponds to the case file base name
+            String networkName = network.getNameOrId();
             byte[] networkData;
             if (listNames.size() == 1) {
                 String extension = listNames.iterator().next();

From 700852a497869b7756978ff1884657516d1feb9b Mon Sep 17 00:00:00 2001
From: achour94 <berrahmaachour@gmail.com>
Date: Mon, 10 Jun 2024 15:45:11 +0200
Subject: [PATCH 2/3] Fix case names when exported

Signed-off-by: achour94 <berrahmaachour@gmail.com>
---
 src/main/java/com/powsybl/caseserver/CaseService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/powsybl/caseserver/CaseService.java b/src/main/java/com/powsybl/caseserver/CaseService.java
index 3551068..29184c7 100644
--- a/src/main/java/com/powsybl/caseserver/CaseService.java
+++ b/src/main/java/com/powsybl/caseserver/CaseService.java
@@ -21,7 +21,6 @@
 import com.powsybl.iidm.network.Exporter;
 import com.powsybl.iidm.network.Importer;
 import com.powsybl.iidm.network.Network;
-import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

From 92d5796c4e5cd381c0a8e3a4cdfc5264c8776c93 Mon Sep 17 00:00:00 2001
From: achour94 <berrahmaachour@gmail.com>
Date: Fri, 14 Jun 2024 11:12:27 +0200
Subject: [PATCH 3/3] Fix case names when exported

Signed-off-by: achour94 <berrahmaachour@gmail.com>
---
 src/main/java/com/powsybl/caseserver/CaseService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/powsybl/caseserver/CaseService.java b/src/main/java/com/powsybl/caseserver/CaseService.java
index 29184c7..c237966 100644
--- a/src/main/java/com/powsybl/caseserver/CaseService.java
+++ b/src/main/java/com/powsybl/caseserver/CaseService.java
@@ -15,6 +15,7 @@
 import com.powsybl.caseserver.repository.CaseMetadataEntity;
 import com.powsybl.caseserver.repository.CaseMetadataRepository;
 import com.powsybl.commons.datasource.DataSource;
+import com.powsybl.commons.datasource.DataSourceUtil;
 import com.powsybl.commons.datasource.MemDataSource;
 import com.powsybl.computation.ComputationManager;
 import com.powsybl.computation.local.LocalComputationManager;
@@ -425,8 +426,7 @@ public Optional<ExportCaseInfos> exportCase(UUID caseUuid, String format, Map<St
             network.write(format, exportProperties, memDataSource);
 
             var listNames = memDataSource.listNames(".*");
-            // the network name corresponds to the case file base name
-            String networkName = network.getNameOrId();
+            String networkName = DataSourceUtil.getBaseName(getCaseName(caseUuid));
             byte[] networkData;
             if (listNames.size() == 1) {
                 String extension = listNames.iterator().next();