RED-9832 - FalsePositives and FalseRecommendations not imported

- update the corresponding functions for entity type import
- fix the problem for upload a dossier template and update its name because of duplicate
- added unit test for duplicate names

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/DossierTemplateImportService.java

@@ -247,6 +247,7 @@ public class DossierTemplateImportService {
             if (StringUtils.isEmpty(dossierTemplateMeta.getName())) {
                 throw new ConflictException("DossierTemplate name must be set");
             }
+            dossierTemplateMeta.setId("");
             this.validateDossierTemplateName(dossierTemplateMeta);
             DossierTemplateEntity dossierTemplateEntity = new DossierTemplateEntity();
 

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/zipreaders/EntityTypeArchiveReader.java

@@ -44,10 +44,10 @@ public class EntityTypeArchiveReader {
             entityTypeImportModel.getEntries().put(zipEntryData.getParentFolder(), entries);
         } else if (zipEntryData.entry().getName().contains(ExportFilename.FALSE_POSITIVES.getFilename())) {
             List<String> falsePositives = this.readEntries(zipEntryData.data());
-            entityTypeImportModel.getFalseRecommendations().put(zipEntryData.getParentFolder(), falsePositives);
+            entityTypeImportModel.getFalsePositives().put(zipEntryData.getParentFolder(), falsePositives);
         } else if (zipEntryData.entry().getName().contains(ExportFilename.FALSE_RECOMMENDATION.getFilename())) {
             List<String> falseRecommendations = this.readEntries(zipEntryData.data());
-            entityTypeImportModel.getDeletedFalseRecommendations().put(zipEntryData.getParentFolder(), falseRecommendations);
+            entityTypeImportModel.getFalseRecommendations().put(zipEntryData.getParentFolder(), falseRecommendations);
         } else if (zipEntryData.entry().getName().contains(ExportFilename.DELETED_ENTRIES.getFilename())) {
             List<String> entries = this.readEntries(zipEntryData.data());
             entityTypeImportModel.getDeletedEntries().put(zipEntryData.getParentFolder(), entries);

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java

@@ -109,6 +109,20 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
         testDossierTemplateImport(archive);
     }
 
+    @SneakyThrows
+    @Test
+    public void testDossierTemplateImportWithTheSameName() {
+
+        TenantContext.setTenantId("redaction");
+
+        var archive = loadFileFromClasspath("EFSA_sanitisation_GFL_v1.zip");
+        var dt1 = testDossierTemplateImport(archive);
+        assertThat(dt1.getName()).isEqualTo("EFSA sanitisation GFL v1");
+        var dt2 = testDossierTemplateImport(archive);
+        assertThat(dt2.getName()).isEqualTo("Copy of EFSA sanitisation GFL v1");
+    }
+
+
 
     @SneakyThrows
     private byte[] loadFileFromClasspath(String filename) {