From 8fa416e39e1df6d113ca89e710f1623145c68ab1 Mon Sep 17 00:00:00 2001
From: aoezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Tue, 22 Mar 2022 09:44:23 +0100
Subject: [PATCH] RED-3246: As an admin I want to clone a dossier template

---
 .../service/DossierTemplateCloneService.java  |  4 +---
 .../tests/DossierTemplateTest.java            | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java
index e0b07c3fe..16c83b492 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateCloneService.java
@@ -142,13 +142,11 @@ public class DossierTemplateCloneService {
         List<TypeEntity> clonedTypes = new ArrayList<>();
         var types = dictionaryPersistenceService.getAllTypesForDossierTemplate(dossierTemplateId);
         for (TypeEntity t : types) {
-            log.info("type: {} id: {}", t.getType(), t.getId());
             TypeEntity te = dictionaryPersistenceService.addType(t.getType(), clonedDossierTemplateId, t.getHexColor(), t.getRecommendationHexColor(), t.getRank(), t.isHint(), t.isCaseInsensitive(), t.isRecommendation(), t.getDescription(), t.isAddToDictionaryAction(), t.getLabel(), null);
             te.setDossierTemplateId(clonedDossierTemplateId);
             clonedTypes.add(te);
             for (DictionaryEntryType det : DictionaryEntryType.values()) {
-                var baseDictionaryEntries = entryPersistenceService.getEntries(t.getId(), det, t.getVersion());
-                log.info("type: {} det {} size: {}", t.getType(), det.name(), baseDictionaryEntries.size());
+                var baseDictionaryEntries = entryPersistenceService.getEntries(t.getId(), det, null);
                 List<String> entries = baseDictionaryEntries.stream().map(baseDictionaryEntry -> baseDictionaryEntry.getValue()).collect(Collectors.toList());
                 entryPersistenceService.addEntry(te.getId(), entries, te.getVersion(), det);
             }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java
index 04a35d323..5ea7e8773 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java
@@ -260,14 +260,14 @@ public class DossierTemplateTest extends AbstractPersistenceServerServiceTest {
                 .manualRedactionColor("#bbbbbb")
                 .build();
         dictionaryClient.setColors(dossierTemplate.getId(), col);
-//        var dossierStatus = CreateOrUpdateDossierStatusRequest.builder()
-//                .name("dossStatus1")
-//                .description("dossier status description")
-//                .color("#115599")
-//                .rank(456)
-//                .dossierTemplateId(dossierTemplate.getId())
-//                .build();
-//        dossierStatusClient.createOrUpdateDossierStatus(dossierStatus);
+        var dossierStatus = CreateOrUpdateDossierStatusRequest.builder()
+                .name("dossStatus1")
+                .description("ds description")
+                .color("#115599")
+                .rank(456)
+                .dossierTemplateId(dossierTemplate.getId())
+                .build();
+        dossierStatusClient.createOrUpdateDossierStatus(dossierStatus);
 
         var allTemplates = dossierTemplateClient.getAllDossierTemplates();
         assertThat(allTemplates.size()).isEqualTo(1);
@@ -301,7 +301,9 @@ public class DossierTemplateTest extends AbstractPersistenceServerServiceTest {
         assertThat(dictionaryClient.getAllTypesForDossierTemplate(dossierTemplate.getId())
                 .get(0)
                 .getRank()).isEqualTo(dictionaryClient.getAllTypesForDossierTemplate(clonedDT.getId()).get(0).getRank());
-        assertThat(dossierStatusClient.getAllDossierStatuses(List.of(dossierTemplate.getId()))).isEqualTo(dossierStatusClient.getAllDossierStatuses(List.of(clonedDT.getId())));
+        assertThat(dossierStatusClient.getAllDossierStatuses(List.of(dossierTemplate.getId()))
+                .get(0)
+                .getDescription()).isEqualTo(dossierStatusClient.getAllDossierStatuses(List.of(clonedDT.getId())).get(0).getDescription());
     }
 
 }