From 145f1d6200f7007634425aa487fd7525ff06c505 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Fri, 16 Jun 2023 09:46:37 +0300 Subject: [PATCH] RED-6855 - Setting for default dossier template manipulation for user actions - add flag applyDictionaryUpdatesToAllDossiersByDefault to dossier template --- .../impl/controller/DossierTemplateController.java | 1 + .../entity/dossier/DossierTemplateEntity.java | 3 +++ .../resources/db/changelog/db.changelog-tenant.yaml | 2 ++ ..._updates_to_all_dossiers_to_dossier_template.yaml | 12 ++++++++++++ .../integration/tests/DossierTemplateTest.java | 3 +++ .../v1/api/shared/model/DossierTemplateModel.java | 3 +++ .../CreateOrUpdateDossierTemplateRequest.java | 2 ++ .../model/dossiertemplate/DossierTemplate.java | 1 + 8 files changed, 27 insertions(+) create mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/53-add-apply_dictionary_updates_to_all_dossiers_to_dossier_template.yaml diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java index 512b39092..3e620d7e6 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java @@ -304,6 +304,7 @@ public class DossierTemplateController implements DossierTemplateResource { .keepImageMetadata(dossierTemplate.isKeepImageMetadata()) .keepHiddenText(dossierTemplate.isKeepHiddenText()) .keepOverlappingObjects(dossierTemplate.isKeepOverlappingObjects()) + .applyDictionaryUpdatesToAllDossiersByDefault(dossierTemplate.isApplyDictionaryUpdatesToAllDossiersByDefault()) .build(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java index 97ee671c6..82ab163a4 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java @@ -75,6 +75,9 @@ public class DossierTemplateEntity { @Column(name = "keep_overlapping_objects") private boolean keepOverlappingObjects; + @Column(name = "apply_dictionary_updates_to_all_dossiers_by_default") + private boolean applyDictionaryUpdatesToAllDossiersByDefault; + @Builder.Default @Column(columnDefinition = "text", name = "download_file_types") @Convert(converter = JSONDownloadFileTypeConverter.class) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml index 255a1f73d..ecd963873 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml @@ -143,3 +143,5 @@ databaseChangeLog: file: db/changelog/tenant/104-added-add-to-all-dossier-to-manual-add-redaction.yaml - include: file: db/changelog/tenant/52-add-file-status-error-timestamp.yaml + - include: + file: db/changelog/tenant/53-add-apply_dictionary_updates_to_all_dossiers_to_dossier_template.yaml diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/53-add-apply_dictionary_updates_to_all_dossiers_to_dossier_template.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/53-add-apply_dictionary_updates_to_all_dossiers_to_dossier_template.yaml new file mode 100644 index 000000000..9911a0767 --- /dev/null +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/53-add-apply_dictionary_updates_to_all_dossiers_to_dossier_template.yaml @@ -0,0 +1,12 @@ +databaseChangeLog: + - changeSet: + id: add-apply_dictionary_updates_to_all_dossiers_to_dossier_template + author: corinaolariu + changes: + - addColumn: + columns: + - column: + name: apply_dictionary_updates_to_all_dossiers_by_default + type: BOOLEAN + defaultValue: false + tableName: dossier_template \ No newline at end of file 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 0154aea97..6a960fbc3 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 @@ -121,15 +121,18 @@ public class DossierTemplateTest extends AbstractPersistenceServerServiceTest { var allTemplates = dossierTemplateClient.getAllDossierTemplates(); assertThat(allTemplates.size()).isEqualTo(1); assertThat(allTemplates.get(0)).isEqualTo(dossierTemplate); + assertThat(dossierTemplate.isApplyDictionaryUpdatesToAllDossiersByDefault()).isFalse(); // update var cru = new DossierTemplateModel(); cru.setDossierTemplateId(dossierTemplate.getId()); BeanUtils.copyProperties(dossierTemplate, cru); cru.setName("Template 1 Update"); + cru.setApplyDictionaryUpdatesToAllDossiersByDefault(true); var updated = dossierTemplateClient.createOrUpdateDossierTemplate(cru); assertThat(updated.getName()).isEqualTo("Template 1 Update"); + assertThat(updated.isApplyDictionaryUpdatesToAllDossiersByDefault()).isTrue(); var loadedTemplate = dossierTemplateClient.getDossierTemplate(dossierTemplate.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/DossierTemplateModel.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java index 2997c00a8..aee26d68f 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java @@ -62,6 +62,9 @@ public class DossierTemplateModel { @Schema(description = "Representing the setting if the overlapping objects in pdfs should get kept or removed by flattening the pages") private boolean keepOverlappingObjects; + @Schema(description = "Representing the setting if dictionary updates is applied to all dossiers") + private boolean applyDictionaryUpdatesToAllDossiersByDefault; + public String 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/CreateOrUpdateDossierTemplateRequest.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java index 63e6ba865..bd7baf76a 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java @@ -35,4 +35,6 @@ public class CreateOrUpdateDossierTemplateRequest { private boolean keepOverlappingObjects; + private boolean applyDictionaryUpdatesToAllDossiersByDefault; + } 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/DossierTemplate.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/DossierTemplate.java index cd413982a..f5eb77257 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/DossierTemplate.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/DossierTemplate.java @@ -33,4 +33,5 @@ public class DossierTemplate { private boolean keepImageMetadata; private boolean keepHiddenText; private boolean keepOverlappingObjects; + private boolean applyDictionaryUpdatesToAllDossiersByDefault; } -- 2.47.2