From 121d1b7f2515f3ce2832fe0e2335b375446359ee Mon Sep 17 00:00:00 2001 From: devplant Date: Tue, 16 Nov 2021 10:18:25 +0200 Subject: [PATCH] RED-2664 All manual Redactions deleted after toggling enable/disable-redaction - remove the wipeFileData when toggleExclusion(true) - integration tests updated --- .../service/ExcludeFromAnalysisService.java | 2 -- .../v1/server/integration/tests/FileTest.java | 34 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ExcludeFromAnalysisService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ExcludeFromAnalysisService.java index 5723e972b..49f7391d5 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ExcludeFromAnalysisService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ExcludeFromAnalysisService.java @@ -27,8 +27,6 @@ public class ExcludeFromAnalysisService { if (!excluded) { // if file has been re-enabled - process it fileStatusService.setStatusFullReprocess(dossierId, fileId, 2); - } else { - fileStatusService.wipeFileData(dossierId, fileId); } } 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 796d00cc2..6bfa2b6da 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 @@ -240,4 +240,38 @@ public class FileTest extends AbstractPersistenceServerServiceTest { assertThat(activeFiles.size()).isEqualTo(0); } + + @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"); + String typeId = type.getId(); + + assertThat(fileClient.getAllStatuses().size()).isEqualTo(1); + + var addRedaction = manualRedactionClient.addAddRedaction(dossierId, fileId, AddRedactionRequest.builder().addToDictionary(true) + .addToDossierDictionary(false).comment("comment").status(AnnotationStatus.REQUESTED).typeId(typeId).user("user").reason("1").value("test").legalBasis("1").build()); + + var loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + + assertThat(manualRedactionClient.getAddRedaction(fileId, addRedaction.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + + fileClient.toggleExclusion(dossier.getId(), file.getId(), true); + loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + assertThat(loadedFile.isExcluded()).isTrue(); + assertThat(manualRedactionClient.getAddRedaction(fileId, addRedaction.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + + + fileClient.toggleExclusion(dossier.getId(), file.getId(), false); + loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId()); + assertThat(loadedFile.isExcluded()).isFalse(); + assertThat(manualRedactionClient.getAddRedaction(fileId, addRedaction.getAnnotationId()).getFileId()).isEqualTo(loadedFile.getId()); + } }