Merge branch 'RED-9548' into 'master'

RED-9495 - Remove here for locally resized dictionary entry should remove the entry completly

Closes RED-9548

See merge request redactmanager/persistence-service!709

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualForceRedactionEntity.java

@@ -36,6 +36,8 @@ public class ManualForceRedactionEntity implements IBaseAnnotation {
     private OffsetDateTime softDeletedTime;
     @Column
     private int page;
+    @Column
+    private String basedOnDictAnnotationId;
 
     @ManyToOne
     private FileEntity fileStatus;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java

@@ -137,6 +137,7 @@ public class ManualRedactionMapper {
 
         for (ForceRedactionRequestModel forceRedactionRequestModel : forceRedactionRequests) {
 
+            String uuid = UUID.randomUUID().toString();
             EntityLogEntry entityLogEntry = entityLogMongoWrapperService.getEntityLogEntryById(dossierId, fileId, forceRedactionRequestModel.getAnnotationId());
             ForceRedactionRequest request = ForceRedactionRequest.builder()
                     .annotationId(forceRedactionRequestModel.getAnnotationId())
@@ -146,7 +147,10 @@ public class ManualRedactionMapper {
                     .build();
 
             if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && !entityLogEntry.getEngines().contains(Engine.IMPORTED) && entryIsEntityType(entityLogEntry)) {
+                request.setBasedOnDictAnnotationId(forceRedactionRequestModel.getAnnotationId());
+                entityLogEntry.setId(uuid);
                 manualRedactionEntryConsumer.accept(entityLogEntry);
+                request.setAnnotationId(uuid);
             }
 
             requests.add(RequestEntryPair.<ForceRedactionRequest>builder().request(request).entityLogEntry(entityLogEntry).build());

persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml

@@ -218,4 +218,6 @@ databaseChangeLog:
   - include:
       file: db/changelog/tenant/132-add-based-on-dict-annotation-id-to-manual_changes.yaml
   - include:
-      file: db/changelog/tenant/133-add-technical-name-to-legal_basis.yaml
+      file: db/changelog/tenant/133-add-technical-name-to-legal_basis.yaml
+  - include:
+      file: db/changelog/tenant/139-add-based-on-dict-annotation-id-to-manual_force_changes.yaml

persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/139-add-based-on-dict-annotation-id-to-manual_force_changes.yaml

@@ -0,0 +1,11 @@
+databaseChangeLog:
+  - changeSet:
+      id: add-annotation-info-to-manual-force
+      author: colariu
+      changes:
+        - addColumn:
+            columns:
+              - column:
+                  name: based_on_dict_annotation_id
+                  type: VARCHAR(255)
+            tableName: manual_force_redaction

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java

@@ -1735,21 +1735,27 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
         when(entityLogService.getEntityLog(any(), any(), anyBoolean())).thenReturn(entityLog);
         entityLogMongoService.upsertEntityLog(file.getDossierId(), file.getFileId(), entityLog);
 
-        manualRedactionClient.forceRedactionBulk(dossier.getId(),
+        ManualRedactionResponse forceResponse = manualRedactionClient.forceRedactionBulk(dossier.getId(),
                                                  file.getId(),
                                                  Set.of(ForceRedactionRequestModel.builder().annotationId("forceRedactionAnnotation").comment("comment").legalBasis("1").build()));
 
         var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
         assertEquals(allManualRedactions.getForceRedactions().size(), 1);
-        assertTrue(allManualRedactions.getForceRedactions()
+        assertFalse(allManualRedactions.getForceRedactions()
                            .stream()
                            .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
+        assertTrue(allManualRedactions.getForceRedactions()
+                            .stream()
+                            .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse.getManualAddResponses().get(0).getAnnotationId())));
 
         var unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true);
         assertEquals(unprocessedManualRedactions.getForceRedactions().size(), 1);
-        assertTrue(unprocessedManualRedactions.getForceRedactions()
+        assertFalse(unprocessedManualRedactions.getForceRedactions()
                            .stream()
                            .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
+        assertTrue(allManualRedactions.getForceRedactions()
+                           .stream()
+                           .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse.getManualAddResponses().get(0).getAnnotationId())));
 
         fileProcessingClient.analysisSuccessful(dossier.getId(),
                                                 file.getId(),
@@ -1761,27 +1767,33 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                                                         .dossierId(dossier.getId())
                                                         .build());
 
-        manualRedactionClient.forceRedactionBulk(dossier.getId(),
+        ManualRedactionResponse forceResponse2 = manualRedactionClient.forceRedactionBulk(dossier.getId(),
                                                  file.getId(),
                                                  Set.of(ForceRedactionRequestModel.builder().annotationId("forceRedactionAnnotation2").comment("comment").legalBasis("1").build()));
 
         allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
         assertEquals(allManualRedactions.getForceRedactions().size(), 2);
-        assertTrue(allManualRedactions.getForceRedactions()
+        assertFalse(allManualRedactions.getForceRedactions()
                            .stream()
                            .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
         assertTrue(allManualRedactions.getForceRedactions()
+                            .stream()
+                            .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse.getManualAddResponses().get(0).getAnnotationId())));
+        assertFalse(allManualRedactions.getForceRedactions()
                            .stream()
-                           .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
+                           .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation2")));
+        assertTrue(allManualRedactions.getForceRedactions()
+                            .stream()
+                            .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse2.getManualAddResponses().get(0).getAnnotationId())));
 
         unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true);
         assertEquals(unprocessedManualRedactions.getForceRedactions().size(), 1);
-        assertTrue(unprocessedManualRedactions.getForceRedactions()
-                           .stream()
-                           .noneMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
-        assertTrue(unprocessedManualRedactions.getForceRedactions()
+        assertFalse(unprocessedManualRedactions.getForceRedactions()
                            .stream()
                            .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation2")));
+        assertTrue(unprocessedManualRedactions.getForceRedactions()
+                           .stream()
+                           .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse2.getManualAddResponses().get(0).getAnnotationId())));
 
         fileProcessingClient.analysisSuccessful(dossier.getId(),
                                                 file.getId(),
@@ -1795,12 +1807,18 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
 
         allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
         assertEquals(allManualRedactions.getForceRedactions().size(), 2);
+        assertFalse(allManualRedactions.getForceRedactions()
+                            .stream()
+                            .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
         assertTrue(allManualRedactions.getForceRedactions()
                            .stream()
-                           .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation")));
+                           .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse.getManualAddResponses().get(0).getAnnotationId())));
+        assertFalse(allManualRedactions.getForceRedactions()
+                            .stream()
+                            .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation2")));
         assertTrue(allManualRedactions.getForceRedactions()
                            .stream()
-                           .anyMatch(entry -> entry.getAnnotationId().equals("forceRedactionAnnotation2")));
+                           .anyMatch(entry -> entry.getAnnotationId().equals(forceResponse2.getManualAddResponses().get(0).getAnnotationId())));
 
         unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true);
         assertTrue(unprocessedManualRedactions.getForceRedactions().isEmpty());
@@ -2751,13 +2769,19 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                                                                                              .build())).getManualAddResponses()
                 .get(0);
 
-        assertEquals(response.getEntityLogEntry().getId(), "AnnotationId");
+        assertEquals(response.getEntityLogEntry().getId(), response.getAnnotationId());
         assertEquals(response.getEntityLogEntry().getLegalBasis(), "legalBasis");
         assertEquals(response.getEntityLogEntry().getState(), EntryState.APPLIED);
         assertEquals(response.getEntityLogEntry().getManualChanges()
                              .get(0).getManualRedactionType(), ManualRedactionType.FORCE);
         assertNull(response.getEntityLogEntry().getManualChanges()
                            .get(0).getProcessedDate());
+
+        var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
+        assertEquals(allManualRedactions.getForceRedactions().size(), 1);
+        assertTrue(allManualRedactions.getForceRedactions()
+                           .stream()
+                           .anyMatch(entry -> entry.getAnnotationId().equals(response.getAnnotationId())));
     }
 
 

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/ForceRedactionRequest.java

@@ -16,5 +16,6 @@ public class ForceRedactionRequest {
     private String legalBasis;
     private String comment;
     private int page;
+    private String basedOnDictAnnotationId;
 
 }

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualForceRedaction.java

@@ -14,6 +14,7 @@ import lombok.experimental.SuperBuilder;
 public class ManualForceRedaction extends BaseAnnotation {
 
     private String legalBasis;
+    private String basedOnDictAnnotationId;
 
 
     @Override