From 8d340057a4bb229b4f306a4afa8abcf95cf83f8d Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 17 Jul 2024 10:13:58 +0200 Subject: [PATCH] RED-5624: Refactoring of justifications added technicalname field to entity --- .../processor/entity/configuration/LegalBasisEntity.java | 2 ++ .../persistence/LegalBasisMappingPersistenceService.java | 6 ++++++ .../v1/server/integration/tests/LegalBasisTest.java | 8 ++++---- .../model/dossiertemplate/legalbasis/LegalBasis.java | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java index 59309f109..f750dc3e1 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java @@ -20,5 +20,7 @@ public class LegalBasisEntity { private String description; @Column(length = 4000) private String reason; + @Column(length = 4000) + private String technicalName; } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java index 35d7bf35a..874d90457 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java @@ -82,12 +82,14 @@ public class LegalBasisMappingPersistenceService { .findAny().ifPresentOrElse(existingBasis -> { existingBasis.setReason(legalBasis.getReason()); existingBasis.setDescription(legalBasis.getDescription()); + existingBasis.setTechnicalName(legalBasis.getTechnicalName()); }, () -> mapping.getLegalBasis() .add(LegalBasisEntity.builder() .name(legalBasis.getName()) .description(legalBasis.getDescription()) .reason(legalBasis.getReason()) + .technicalName(legalBasis.getTechnicalName()) .build())); mapping.setVersion(mapping.getVersion() + 1); @@ -109,6 +111,10 @@ public class LegalBasisMappingPersistenceService { if (legalBasis.getReason().length() > MAX_LEGAL_BASIS_LENGTH) { throw new BadRequestException(String.format("The legal basis is too long (%s), max length %s", legalBasis.getReason().length(), MAX_LEGAL_BASIS_LENGTH)); } + + if(legalBasis.getTechnicalName().length() > MAX_LEGAL_BASIS_LENGTH) { + throw new BadRequestException(String.format("The legal basis is too long (%s), max length %s", legalBasis.getTechnicalName().length(), MAX_LEGAL_BASIS_LENGTH)); + } } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java index 0fbb86efe..9dfbb772b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java @@ -41,8 +41,8 @@ public class LegalBasisTest extends AbstractPersistenceServerServiceTest { } var mappings = new ArrayList(); - mappings.add(LegalBasis.builder().name("test 1").description("test 1").reason("test 1").build()); - mappings.add(LegalBasis.builder().name("test 2").description("test 2").reason("test 2").build()); + mappings.add(LegalBasis.builder().name("test 1").description("test 1").reason("test 1").technicalName("test 1").build()); + mappings.add(LegalBasis.builder().name("test 2").description("test 2").reason("test 2").technicalName("test 2").build()); legalBasisClient.setLegalBasisMapping(mappings, dossierTemplate.getId()); var mapping = legalBasisClient.getLegalBasisMapping(dossierTemplate.getId()); @@ -51,7 +51,7 @@ public class LegalBasisTest extends AbstractPersistenceServerServiceTest { .map(LegalBasis::getName) .collect(Collectors.toList())).containsExactlyInAnyOrder("test 1", "test 2"); - var legalBasis = LegalBasis.builder().name("test 3").description("test 3").reason("test 3").build(); + var legalBasis = LegalBasis.builder().name("test 3").description("test 3").reason("test 3").technicalName("test 3").build(); legalBasisClient.addOrUpdateLegalBasis(dossierTemplate.getId(), legalBasis); mapping = legalBasisClient.getLegalBasisMapping(dossierTemplate.getId()); @@ -60,7 +60,7 @@ public class LegalBasisTest extends AbstractPersistenceServerServiceTest { .map(LegalBasis::getName) .collect(Collectors.toList())).containsExactlyInAnyOrder("test 1", "test 2", "test 3"); - legalBasis = LegalBasis.builder().name("test 3").reason("test 3").description("test 3 - updated").build(); + legalBasis = LegalBasis.builder().name("test 3").reason("test 3").description("test 3 - updated").technicalName("test 3").build(); legalBasisClient.addOrUpdateLegalBasis(dossierTemplate.getId(), legalBasis); mapping = legalBasisClient.getLegalBasisMapping(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/dossiertemplate/legalbasis/LegalBasis.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/legalbasis/LegalBasis.java index 92ba577a1..66203ac0e 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/legalbasis/LegalBasis.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/legalbasis/LegalBasis.java @@ -14,5 +14,6 @@ public class LegalBasis { private String name; private String description; private String reason; + private String technicalName; }