diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java index 1052c9f6d..174e4b44c 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java @@ -50,6 +50,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus; +import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.AddCommentRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.AddRedactionRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.ForceRedactionRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.ImageRecategorizationRequest; @@ -400,48 +401,48 @@ public class FileTest extends AbstractPersistenceServerServiceTest { } -// @Test -// public void testToggleEnableRedactionTwice() { -// -// var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); -// -// var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); -// String dossierId = dossier.getId(); -// -// var file = fileTesterAndProvider.testAndProvideFile(dossier); -// String fileId = file.getId(); -// -// var type = typeProvider.testAndProvideType(dossierTemplate, null, "manual"); -// -// assertThat(fileClient.getDossierStatus(dossier.getId()).size()).isEqualTo(1); -// -// var userId = userProvider.getUserId(); -// -// fileClient.setStatusUnderReview(dossier.getId(), file.getId(), userId); -// -// var addRedaction = manualRedactionClient.requestBulkAddRedaction(dossierId, -// fileId, -// Set.of(AddRedactionRequest.builder() -// .addToDictionary(true) -// .addToDossierDictionary(false) -// .comment(new AddCommentRequest("comment")) -// .type(type.getType()) -// .reason("1") -// .value("test") -// .legalBasis("1") -// .build())).iterator().next(); -// -// var loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); -// -// -// reanalysisClient.toggleExclusion(dossier.getId(), file.getId(), true); -// loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); -// assertThat(loadedFile.isExcluded()).isTrue(); -// -// reanalysisClient.toggleExclusion(dossier.getId(), file.getId(), false); -// loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); -// assertThat(loadedFile.isExcluded()).isFalse(); -// } + @Test + public void testToggleEnableRedactionTwice() { + + var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); + + var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); + String dossierId = dossier.getId(); + + var file = fileTesterAndProvider.testAndProvideFile(dossier); + String fileId = file.getId(); + + var type = typeProvider.testAndProvideType(dossierTemplate, null, "manual"); + + assertThat(fileClient.getDossierStatus(dossier.getId()).size()).isEqualTo(1); + + var userId = userProvider.getUserId(); + + fileClient.setStatusUnderReview(dossier.getId(), file.getId(), userId); + + var addRedaction = manualRedactionClient.addRedactionBulk(dossierId, + fileId, + Set.of(AddRedactionRequest.builder() + .addToDictionary(true) + .addToAllDossiers(false) + .comment(new AddCommentRequest("comment")) + .type(type.getType()) + .reason("1") + .value("test") + .legalBasis("1") + .build())).iterator().next(); + + var loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + + + reanalysisClient.toggleExclusion(dossier.getId(), file.getId(), true); + loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + assertThat(loadedFile.isExcluded()).isTrue(); + + reanalysisClient.toggleExclusion(dossier.getId(), file.getId(), false); + loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + assertThat(loadedFile.isExcluded()).isFalse(); + } @Test diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java index ef0ecd05f..43331450d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java @@ -1215,7 +1215,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedRedactionsFile2.getResizeRedactions().stream().toList().get(0).getValue()).isEqualTo("test redaction in dossier template dictionary"); var dictEntries = dictionaryManagementService.getAllEntriesInDossierTemplate(dossierTemplate.getDossierTemplateId(), "test redaction in dossier template dictionary"); - assertThat(dictEntries.stream().filter(dictionaryEntry -> dictionaryEntry.getValue().equals("test redaction in dossier template dictionary"))).isNotEmpty(); + assertThat(dictEntries.stream().filter(dictionaryEntry -> dictionaryEntry.getValue().equals("test redaction in dossier template dictionary"))).hasSize(1); var dictionaryOfTypeDosDictInDossier1 = dictionaryClient.getDictionaryForType(typeDosDict.getType(), dossier1.getDossierTemplateId(), dossier1.getDossierId()); assertThat(dictionaryOfTypeDosDictInDossier1.getEntries()).hasSize(1);