Merge branch 'RED-8480-bp2' into 'release/2.349.x'

RED-8480: added property value for recategorizations and fixed bugs not...

See merge request redactmanager/persistence-service!407

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

@@ -51,6 +51,8 @@ public class ManualRecategorizationEntity implements IBaseAnnotation {
     private String legalBasis;
     @Column(length = 1024)
     private String section;
+    @Column
+    private String value;
 
     @ManyToOne
     private FileEntity fileStatus;

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

@@ -347,10 +347,21 @@ public class EntityLogMergeService {
 
         boolean isHint = isHint(recategorization.getType(), dossier);
 
-        entityLogEntry.setType(recategorization.getType());
+        if (!Strings.isNullOrEmpty(recategorization.getType())) {
+            entityLogEntry.setType(recategorization.getType());
+        }
         entityLogEntry.setEntryType(getEntryType(isHint, recategorization.getType()));
         entityLogEntry.setState(isHint ? EntryState.SKIPPED : EntryState.APPLIED);
         entityLogEntry.getEngines().add(Engine.MANUAL);
+        if (!Strings.isNullOrEmpty(recategorization.getLegalBasis())) {
+            entityLogEntry.setLegalBasis(recategorization.getLegalBasis());
+        }
+        if (!Strings.isNullOrEmpty(recategorization.getSection())) {
+            entityLogEntry.setSection(recategorization.getSection());
+        }
+        if (!Strings.isNullOrEmpty(recategorization.getValue())) {
+            entityLogEntry.setValue(recategorization.getValue());
+        }
 
         addChanges(entityLogEntry.getChanges(), ChangeType.CHANGED, analysisNumber, recategorization.getRequestDate());
         entityLogEntry.getManualChanges()
@@ -376,6 +387,9 @@ public class EntityLogMergeService {
         if (!Strings.isNullOrEmpty(recategorization.getSection())) {
             propertyChanges.put("section", recategorization.getSection());
         }
+        if (!Strings.isNullOrEmpty(recategorization.getValue())) {
+            propertyChanges.put("value", recategorization.getValue());
+        }
         return propertyChanges;
     }
 

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

@@ -161,6 +161,7 @@ public class ManualRedactionMapper {
                     .legalBasis(Optional.ofNullable(recategorizationRequest.getLegalBasis())
                                         .orElse(""))
                     .section(recategorizationRequest.getSection())
+                    .value(recategorizationRequest.getValue())
                     .build();
             requests.add(build);
         }

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

@@ -172,7 +172,9 @@ public class PendingDictionaryEntryFactory {
                                                                     "legalBasis",
                                                                     manualChange.getLegalBasis(),
                                                                     "section",
-                                                                    manualChange.getSection()))
+                                                                    manualChange.getSection(),
+                                                                    "value",
+                                                                    manualChange.getValue()))
                                             .build());
 
         return EntityLogEntry.builder()

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

@@ -191,3 +191,5 @@ databaseChangeLog:
       file: db/changelog/tenant/sql/206-remove-manual-redactions-on-non-existing-pages.sql
   - include:
       file: db/changelog/tenant/122-add-legal-basis-variables-to-recategorize.yaml
+  - include:
+      file: db/changelog/tenant/123-add-value-to-recategorize.yaml

persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/123-add-value-to-recategorize.yaml

@@ -0,0 +1,11 @@
+databaseChangeLog:
+  - changeSet:
+      id: add-legal-basis-variables-to-recategorize
+      author: ali
+      changes:
+        - addColumn:
+            tableName: manual_recategorization
+            columns:
+              - column:
+                  name: value
+                  type: VARCHAR(4000)

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

@@ -1199,6 +1199,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                                                               .addToAllDossiers(true)
                                                               .legalBasis("")
                                                               .section("section")
+                                                              .value(lukeSkywalker)
                                                               .build()),
                                                false);
 
@@ -1284,6 +1285,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                                                               .addToAllDossiers(false)
                                                               .legalBasis("")
                                                               .section("section")
+                                                              .value(lukeSkywalker)
                                                               .build()),
                                                false);
 
@@ -1888,6 +1890,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                 .addToAllDossiers(true)
                 .legalBasis("")
                 .section("section")
+                .value("other value")
                 .build();
         var recatModelLongLegalBasis = RecategorizationRequestModel.builder()
                 .type(type.getType())
@@ -1901,6 +1904,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                 .annotationId("annotationId3")
                 .addToDictionary(true)
                 .section("section")
+                .value("some value")
                 .addToAllDossiers(true)
                 .build();
 

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

@@ -18,6 +18,7 @@ public class ManualRecategorization extends BaseAnnotation {
     private boolean addToDictionary;
     private boolean addToAllDossiers;
     private String section;
+    private String value;
 
 
     @Override

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/RecategorizationRequestModel.java

@@ -21,5 +21,6 @@ public class RecategorizationRequestModel {
     boolean addToAllDossiers;
     String legalBasis;
     String section;
+    String value;
 
 }