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 e703fff62..2cb3aa4c4 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 @@ -93,6 +93,10 @@ public class DossierTemplateCloneService { clonedDossierTemplate.setDossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplatePersistenceService.computeDossierTemplateStatus(clonedDossierTemplate) .name())); + + clonedDossierTemplate.setOcrByDefault(cloneDossierTemplateRequest.isOcrByDefault()); + clonedDossierTemplate.setRemoveWatermark(cloneDossierTemplateRequest.isRemoveWatermark()); + dossierTemplatePersistenceService.insertDossierTemplate(clonedDossierTemplate); //set dictionaries 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 c0b008f31..20fa8a29e 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 @@ -300,9 +300,16 @@ public class DossierTemplateTest extends AbstractPersistenceServerServiceTest { assertThat(allTemplates.size()).isEqualTo(1); assertThat(allTemplates.get(0)).isEqualTo(dossierTemplate); - CloneDossierTemplateRequest cdtr = CloneDossierTemplateRequest.builder().name("Clone of " + dossierTemplate.getName()).cloningUserId("user").build(); + CloneDossierTemplateRequest cdtr = CloneDossierTemplateRequest.builder() + .name("Clone of " + dossierTemplate.getName()) + .cloningUserId("user") + .ocrByDefault(true) + .removeWatermark(false) + .build(); var clonedDT = dossierTemplateClient.cloneDossierTemplate(dossierTemplate.getId(), cdtr); assertThat(clonedDT.getName()).isEqualTo("Clone of " + dossierTemplate.getName()); + assertThat(clonedDT.isRemoveWatermark()).isFalse(); + assertThat(clonedDT.isOcrByDefault()).isTrue(); var loadedTemplate = dossierTemplateClient.getDossierTemplate(clonedDT.getId()); assertThat(loadedTemplate.getId()).isEqualTo(clonedDT.getId()); diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CloneDossierTemplateRequest.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CloneDossierTemplateRequest.java index 2171ec216..e4b4fc1f7 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CloneDossierTemplateRequest.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CloneDossierTemplateRequest.java @@ -21,5 +21,7 @@ public class CloneDossierTemplateRequest { private OffsetDateTime validTo; private String cloningUserId; private Set downloadFileTypes = new HashSet<>(); + private boolean ocrByDefault; + private boolean removeWatermark; }