diff --git a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts index 588ff571..77476ddd 100644 --- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts @@ -7,7 +7,7 @@ description = "redaction-service-api-v1" dependencies { implementation("org.springframework:spring-web:6.0.12") - implementation("com.iqser.red.service:persistence-service-internal-api-v1:RED-8480-2") + implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.351.0") } publishing { diff --git a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts index 2bf191b6..bd56e7c0 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -16,7 +16,7 @@ val layoutParserVersion = "0.86.0" val jacksonVersion = "2.15.2" val droolsVersion = "9.44.0.Final" val pdfBoxVersion = "3.0.0" -val persistenceServiceVersion = "RED-8480-2" +val persistenceServiceVersion = "2.351.0" val springBootStarterVersion = "3.1.5" configurations { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java index 7fb76a2f..2584ff40 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java @@ -131,7 +131,7 @@ public class ManualChangeOverwrite { if (manualChange instanceof ManualRecategorization recategorization) { recategorized = true; type = recategorization.getType(); - if (!recategorization.getLegalBasis().isEmpty()) { + if (recategorization.getLegalBasis() != null && !recategorization.getLegalBasis().isEmpty()) { legalBasis = recategorization.getLegalBasis(); } } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index e10a911b..95980612 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -1014,7 +1014,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { .annotationId("675eba69b0c2917de55462c817adaa05") .fileId("fileId") .legalBasis("Something") - .requestDate(OffsetDateTime.now()) + .requestDate(OffsetDateTime.now()) .processedDate(OffsetDateTime.now()) .build())); @@ -1040,14 +1040,14 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder() .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf") .fileId("fileId") - .requestDate(OffsetDateTime.now()) + .requestDate(OffsetDateTime.now()) .processedDate(OffsetDateTime.now()) .build())); manualRedactions.setLegalBasisChanges((Set.of(ManualLegalBasisChange.builder() .annotationId("675eba69b0c2917de55462c817adaa05") .fileId("fileId") .legalBasis("Manual Legal Basis Change") - .processedDate(OffsetDateTime.now()) + .processedDate(OffsetDateTime.now()) .requestDate(OffsetDateTime.now()) .build()))); manualRedactions.setResizeRedactions(Set.of(ManualResizeRedaction.builder() @@ -1060,7 +1060,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { Rectangle.builder().topLeftX(298.67056f).topLeftY(327.567f).width(7.648041f).height(75.32377f).page(1).build(), Rectangle.builder().topLeftX(307.89517f).topLeftY(327.567f).width(7.648041f).height(61.670967f).page(1).build(), Rectangle.builder().topLeftX(316.99985f).topLeftY(327.567f).width(7.648041f).height(38.104286f).page(1).build())) - .updateDictionary(false) + .updateDictionary(false) .build())); analyzeService.reanalyze(request); @@ -1193,7 +1193,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { .section("[19, 2]: Paragraph: Contact point: LexCo Contact:") .value("0049 331 441 551 14") .requestDate(OffsetDateTime.now()) - .fileId(TEST_FILE_ID) + .fileId(TEST_FILE_ID) .legalBasis("Article 39(e)(2) of Regulation (EC) No 178/2002") .build())) .build()); @@ -1230,14 +1230,15 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { .section("[19, 2]: Paragraph: Contact point: LexCo Contact:") .value("0049 331 441 551 14") .requestDate(OffsetDateTime.now()) - .fileId(TEST_FILE_ID) + .fileId(TEST_FILE_ID) .legalBasis("Article 39(e)(2) of Regulation (EC) No 178/2002") .build())) .recategorizations(Set.of(ManualRecategorization.builder() .annotationId("3029651d0842a625f2d23f8375c23600") .type("CBI_author") + .legalBasis("") .requestDate(OffsetDateTime.now()) - .fileId(TEST_FILE_ID) + .fileId(TEST_FILE_ID) .build())) .build()); @@ -1331,6 +1332,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { assertEquals(entityLog.getEntityLogEntry().stream().filter(entityLogEntry -> entityLogEntry.getId().equals(manualAddId2)).findFirst().get().getState(), EntryState.REMOVED); } + @Test @SneakyThrows public void testResizeWithUpdateDictionaryTrue() { @@ -1345,14 +1347,14 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { var david = entityLog.getEntityLogEntry().stream().filter(e -> e.getValue().equals("David")).findFirst().get(); request.setManualRedactions(ManualRedactions.builder() - .resizeRedactions(Set.of(ManualResizeRedaction.builder() - .updateDictionary(true) - .annotationId(david.getId()) - .requestDate(OffsetDateTime.now()) - .value("David Ksenia") - .positions(List.of(Rectangle.builder().topLeftX(56.8f).topLeftY(293.564f).width(65.592f).height(15.408f).page(1).build())) - .addToAllDossiers(false) - .build())) + .resizeRedactions(Set.of(ManualResizeRedaction.builder() + .updateDictionary(true) + .annotationId(david.getId()) + .requestDate(OffsetDateTime.now()) + .value("David Ksenia") + .positions(List.of(Rectangle.builder().topLeftX(56.8f).topLeftY(293.564f).width(65.592f).height(15.408f).page(1).build())) + .addToAllDossiers(false) + .build())) .build()); analyzeService.reanalyze(request); entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID); @@ -1364,12 +1366,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { private IdRemoval getIdRemoval(String id) { - return IdRemoval.builder() - .annotationId(id) - .removeFromAllDossiers(false) - .removeFromDictionary(false) - .requestDate(OffsetDateTime.now()) - .build(); + return IdRemoval.builder().annotationId(id).removeFromAllDossiers(false).removeFromDictionary(false).requestDate(OffsetDateTime.now()).build(); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java index 85d8311c..e5761ebe 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java @@ -115,7 +115,12 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest { assertEquals(legalBasis, entity.getManualOverwrite().getLegalBasis().orElse(entity.getMatchedRule().getLegalBasis())); assertEquals(section, entity.getManualOverwrite().getSection().orElse(entity.getDeepestFullyContainingNode().toString())); - ManualRecategorization imageRecategorizationRequest = ManualRecategorization.builder().type("type").requestDate(start.plusSeconds(5)).annotationId(annotationId).build(); + ManualRecategorization imageRecategorizationRequest = ManualRecategorization.builder() + .type("type") + .requestDate(start.plusSeconds(5)) + .annotationId(annotationId) + .legalBasis("") + .build(); entity.getManualOverwrite().addChange(imageRecategorizationRequest); assertTrue(entity.getManualOverwrite().getRecategorized().isPresent()); assertTrue(entity.getManualOverwrite().getRecategorized().get());