From 682af154f40160b5954bbc320257537dbf38b6ca Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Thu, 16 May 2024 22:21:26 +0200
Subject: [PATCH] RED-8670: integrate table inference from research

---
 .../impl/controller/DossierTemplateControllerV2.java  | 11 +++++++----
 publish-custom-image.sh                               | 10 ++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java
index 578c67268..701f5efa8 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java
@@ -15,6 +15,7 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.Locale;
 
+import org.mapstruct.factory.Mappers;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -74,6 +75,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource {
     private final AuditPersistenceService auditPersistenceService;
     private final FileAttributesController fileAttributesController;
     private final ComponentMappingService componentMappingService;
+    private final ComponentMappingMapper componentMappingMapper = ComponentMappingMapper.INSTANCE;
 
 
     public List<DossierTemplateModel> getAllDossierTemplates() {
@@ -229,7 +231,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource {
     public ComponentMappingSummaries getComponentMappingSummaries(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId) {
 
         List<ComponentMappingMetaData> summaries = componentMappingService.getMetaDataByDossierTemplateId(dossierTemplateId);
-        List<ComponentMappingSummary> componentMappingSummaryList = ComponentMappingMapper.INSTANCE.toComponentMappingSummaryList(summaries);
+        List<ComponentMappingSummary> componentMappingSummaryList = componentMappingMapper.toComponentMappingSummaryList(summaries);
         return new ComponentMappingSummaries(dossierTemplateId, componentMappingSummaryList);
     }
 
@@ -245,10 +247,11 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource {
         }
 
         File mappingFile = saveToFile(file);
+        String fileName = file.getOriginalFilename() == null ? nameToUse + ".csv" : file.getOriginalFilename();
 
-        ComponentMappingMetaData metaData = componentMappingService.create(dossierTemplateId, nameToUse, file.getName(), delimiter, encoding, mappingFile);
+        ComponentMappingMetaData metaData = componentMappingService.create(dossierTemplateId, nameToUse, fileName , delimiter, encoding, mappingFile);
 
-        return ComponentMappingMapper.INSTANCE.toComponentMappingSummary(metaData);
+        return componentMappingMapper.toComponentMappingSummary(metaData);
     }
 
 
@@ -260,7 +263,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource {
 
         ComponentMappingMetaData resultMetaData = componentMappingService.update(componentMappingId, encoding, delimiter, mappingFile);
 
-        return ComponentMappingMapper.INSTANCE.toComponentMappingSummary(resultMetaData);
+        return componentMappingMapper.toComponentMappingSummary(resultMetaData);
     }
 
 
diff --git a/publish-custom-image.sh b/publish-custom-image.sh
index a02f13aaa..5a0def0ea 100755
--- a/publish-custom-image.sh
+++ b/publish-custom-image.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-dir=${PWD##*/}
-gradle assemble
 
 set -e
 
+dir=${PWD##*/}
+
+gradle assemble
+
 # Get the current Git branch
 branch=$(git rev-parse --abbrev-ref HEAD)
 
@@ -13,9 +15,9 @@ commit_hash=$(git rev-parse --short=5 HEAD)
 # Combine branch and commit hash
 buildName="${USER}-${branch}-${commit_hash}"
 
-gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
+gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${buildName}
 
-newImageName="nexus.knecon.com:5001/red/${dir}-server-v1:$buildName"
+newImageName="nexus.knecon.com:5001/red/${dir}-server-v1:${buildName}"
 
 echo "full image name:"
 echo ${newImageName}