Final touches for RED-3242

persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -9,3 +9,5 @@ databaseChangeLog:
       file: db/changelog/4-archived-dossier.changelog.yaml
   - include:
       file: db/changelog/5-imported-annotation.changelog.yaml
+  - include:
+      file: db/changelog/6-excluded-from-automatic-analysis-file-column.changelog.yaml

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

@@ -1,20 +1,20 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.FileProcessingClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.MessageType;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class FileProcessingTest extends AbstractPersistenceServerServiceTest {
 
@@ -48,6 +48,7 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest {
         assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.ERROR);
 
         fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(), AnalyzeResult.builder()
+                .manualRedactions(new ManualRedactions())
                 .messageType(MessageType.FULL_ANALYSE)
                 .analysisVersion(100)
                 .fileId(file.getId())
@@ -97,6 +98,7 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest {
         assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.ERROR);
 
         fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(), AnalyzeResult.builder()
+                .manualRedactions(new ManualRedactions())
                 .messageType(MessageType.FULL_ANALYSE)
                 .analysisVersion(100)
                 .fileId(file.getId())
@@ -138,6 +140,7 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest {
         var file = fileTesterAndProvider.testAndProvideFile(dossier);
 
         fileProcessingClient.analysisSuccessful(dossier.getId(), file.getId(), AnalyzeResult.builder()
+                .manualRedactions(new ManualRedactions())
                 .messageType(MessageType.FULL_ANALYSE)
                 .analysisVersion(100)
                 .fileId(file.getId())

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

@@ -291,8 +291,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                 .build());
         var loadedForceRedaction2 = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction2.getAnnotationId());
         assertThat(loadedForceRedaction2.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
-        assertThat(loadedForceRedaction2.getProcessedDate()).isNotNull();
+        assertThat(loadedForceRedaction2.getProcessedDate()).isNull();
-
 
         manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(), forceRedaction2.getAnnotationId(), JSONPrimitive.of(AnnotationStatus.REQUESTED));
         loadedForceRedaction2 = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction2.getAnnotationId());