From a2727246e146418abdcfebaf1b5269d79d101a6d Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Thu, 31 Mar 2022 09:25:13 +0200 Subject: [PATCH 1/3] RED-3287: Improve RedactionLog Controller to allow incremental calls --- .../api/resources/RedactionLogResource.java | 8 ++ .../controller/RedactionLogController.java | 9 +++ .../server/service/RedactionLogService.java | 81 +++++++++++++++++++ .../integration/tests/RedactionLogTest.java | 11 +++ 4 files changed, 109 insertions(+) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java index 877128da5..86f378371 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java @@ -1,5 +1,6 @@ package com.iqser.red.service.persistence.service.v1.api.resources; +import java.time.OffsetDateTime; import java.util.List; import org.springframework.http.HttpStatus; @@ -34,4 +35,11 @@ public interface RedactionLogResource { @GetMapping(value = SECTION_GRID_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) SectionGrid getSectionGrid(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId); + @GetMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/filtered", produces = MediaType.APPLICATION_JSON_VALUE) + RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, + @RequestParam(value = "excludedType", required = false) List excludedTypes, + @RequestParam(value = "withManualRedactions", required = false, defaultValue = "true") boolean withManualRedactions, + @RequestParam(value = "includeFalsePositives", required = false, defaultValue = "false") boolean includeFalsePositives, + @RequestParam(value = "specifiedDate") OffsetDateTime specifiedDate); + } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java index d4bd7abcb..697717daa 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java @@ -1,5 +1,6 @@ package com.iqser.red.service.peristence.v1.server.controller; +import java.time.OffsetDateTime; import java.util.List; import org.springframework.web.bind.annotation.PathVariable; @@ -35,4 +36,12 @@ public class RedactionLogController implements RedactionLogResource { return redactionLogService.getSectionGrid(dossierId, fileId); } + public RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, + @RequestParam(value = "excludedType", required = false) List excludedTypes, + @RequestParam(value = "withManualRedactions", required = false, defaultValue = "true") boolean withManualRedactions, + @RequestParam(value = "includeFalsePositives", required = false, defaultValue = "false") boolean includeFalsePositives, + @RequestParam(value = "specifiedDate") OffsetDateTime specifiedDate) { + return redactionLogService.getFilteredRedactionLog(dossierId, fileId, excludedTypes, withManualRedactions, includeFalsePositives, specifiedDate); + } + } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java index b18cab878..fe6d8f5d6 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java @@ -1,6 +1,9 @@ package com.iqser.red.service.peristence.v1.server.service; +import java.time.OffsetDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -9,7 +12,11 @@ import com.iqser.red.service.peristence.v1.server.client.RedactionClient; import com.iqser.red.service.peristence.v1.server.controller.DictionaryController; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; +import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment; +import com.iqser.red.service.redaction.v1.model.Change; +import com.iqser.red.service.redaction.v1.model.ManualChange; import com.iqser.red.service.redaction.v1.model.RedactionLog; +import com.iqser.red.service.redaction.v1.model.RedactionLogEntry; import com.iqser.red.service.redaction.v1.model.RedactionRequest; import com.iqser.red.service.redaction.v1.model.SectionGrid; @@ -85,4 +92,78 @@ public class RedactionLogService { return fileManagementStorageService.getSectionGrid(dossierId, fileId); } + + public RedactionLog getFilteredRedactionLog(String dossierId, String fileId, List excludedTypes, boolean withManualRedactions, boolean includeFalsePositives, + OffsetDateTime specifiedDate) { + + var redactionLog = getRedactionLog(dossierId, fileId, excludedTypes, withManualRedactions, includeFalsePositives); + + List filteredRedactionLogEntries = new ArrayList<>(); + RedactionLog filteredRedactionLog = new RedactionLog(redactionLog.getAnalysisVersion(), redactionLog.getAnalysisNumber(), filteredRedactionLogEntries, redactionLog.getLegalBasis(), redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion(), redactionLog.getRulesVersion(), redactionLog.getLegalBasisVersion()); + + for (var redactionLogEntry : redactionLog.getRedactionLogEntry()) { + RedactionLogEntry frle = RedactionLogEntry.builder() + .id(redactionLogEntry.getId()) + .type(redactionLogEntry.getType()) + .value(redactionLogEntry.getValue()) + .reason(redactionLogEntry.getReason()) + .matchedRule(redactionLogEntry.getMatchedRule()) + .rectangle(redactionLogEntry.isRectangle()) + .legalBasis(redactionLogEntry.getLegalBasis()) + .imported(redactionLogEntry.isImported()) + .redacted(redactionLogEntry.isRedacted()) + .isHint(redactionLogEntry.isHint()) + .isRecommendation(redactionLogEntry.isRecommendation()) + .isFalsePositive(redactionLogEntry.isFalsePositive()) + .section(redactionLogEntry.getSection()) + .color(redactionLogEntry.getColor()) + .positions(redactionLogEntry.getPositions()) + .sectionNumber(redactionLogEntry.getSectionNumber()) + .textBefore(redactionLogEntry.getTextBefore()) + .textAfter(redactionLogEntry.getTextAfter()) + .startOffset(redactionLogEntry.getStartOffset()) + .endOffset(redactionLogEntry.getEndOffset()) + .isImage(redactionLogEntry.isImage()) + .imageHasTransparency(redactionLogEntry.isImageHasTransparency()) + .isDictionaryEntry(redactionLogEntry.isDictionaryEntry()) + .isDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry()) + .excluded(redactionLogEntry.isExcluded()) + .engines(redactionLogEntry.getEngines()) + .reference(redactionLogEntry.getReference()) + .build(); + + var changes = redactionLogEntry.getChanges(); + List filteredChanges = new ArrayList<>(); + for (var change : changes) { + if (change.getDateTime().isAfter(specifiedDate)) { + filteredChanges.add(change); + } + } + frle.setChanges(filteredChanges); + + var manualChanges = redactionLogEntry.getManualChanges(); + List filteredManualChanges = new ArrayList<>(); + for (var manualChange: manualChanges){ + if(manualChange.getProcessedDate().isAfter(specifiedDate)) { + filteredManualChanges.add(manualChange); + } + } + frle.setManualChanges(filteredManualChanges); + + var comments = redactionLogEntry.getComments(); + List filteredComments = new ArrayList<>(); + for (var comment: comments) { + if(comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(specifiedDate) || comment.getDate().isAfter(specifiedDate)) { + filteredComments.add(comment); + } + } + frle.setComments(filteredComments); + + filteredRedactionLogEntries.add(frle); + } + filteredRedactionLog.setRedactionLogEntry(filteredRedactionLogEntries); + + return filteredRedactionLog; + } + } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java index 7e10d0e07..7df97e7e7 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java @@ -2,6 +2,8 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; +import java.time.OffsetDateTime; + import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +32,15 @@ public class RedactionLogTest extends AbstractPersistenceServerServiceTest { assertThat(redactionLogClient.getSectionGrid(dossier.getId(), file.getId())).isNotNull(); assertThat(redactionLogClient.getRedactionLog(dossier.getId(), file.getId(), null, true, false)).isNotNull(); assertThat(redactionLogClient.getRedactionLog(dossier.getId(), file.getId(), null, false, false)).isNotNull(); + assertThat(redactionLogClient.getFilteredRedactionLog(dossier.getId(), file.getId(), null, true, false, OffsetDateTime.now())).isNotNull(); + } + + @Test + public void testFilteredRedactionLog() { + + var dossier = dossierTesterAndProvider.provideTestDossier(); + var file = fileTesterAndProvider.testAndProvideFile(dossier); + } } From b13c4623b4c339cc7d101b2f52570a36dd981e52 Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Thu, 31 Mar 2022 12:10:23 +0200 Subject: [PATCH 2/3] RED-3287: Improve RedactionLog Controller to allow incremental calls --- .../FilteredRedactionLogRequest.java | 21 ++++++++++++++++ .../api/resources/RedactionLogResource.java | 10 ++++---- .../controller/RedactionLogController.java | 9 ++++--- .../server/service/RedactionLogService.java | 24 ++++++++++++------- .../integration/tests/RedactionLogTest.java | 17 +++++++------ 5 files changed, 53 insertions(+), 28 deletions(-) create mode 100644 persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/redactionlog/FilteredRedactionLogRequest.java diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/redactionlog/FilteredRedactionLogRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/redactionlog/FilteredRedactionLogRequest.java new file mode 100644 index 000000000..10ecabfe8 --- /dev/null +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/redactionlog/FilteredRedactionLogRequest.java @@ -0,0 +1,21 @@ +package com.iqser.red.service.persistence.service.v1.api.model.redactionlog; + +import java.time.OffsetDateTime; +import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class FilteredRedactionLogRequest { + + private List excludedTypes; + private boolean withManualRedactions; + private boolean includeFalsePositives; + private OffsetDateTime specifiedDate; +} diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java index 86f378371..135822c08 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java @@ -7,9 +7,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; +import com.iqser.red.service.persistence.service.v1.api.model.redactionlog.FilteredRedactionLogRequest; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.SectionGrid; @@ -35,11 +38,8 @@ public interface RedactionLogResource { @GetMapping(value = SECTION_GRID_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) SectionGrid getSectionGrid(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId); - @GetMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/filtered", produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/filtered", produces = MediaType.APPLICATION_JSON_VALUE) RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, - @RequestParam(value = "excludedType", required = false) List excludedTypes, - @RequestParam(value = "withManualRedactions", required = false, defaultValue = "true") boolean withManualRedactions, - @RequestParam(value = "includeFalsePositives", required = false, defaultValue = "false") boolean includeFalsePositives, - @RequestParam(value = "specifiedDate") OffsetDateTime specifiedDate); + @RequestBody FilteredRedactionLogRequest filteredRedactionLogRequest); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java index 697717daa..f381b06b8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/RedactionLogController.java @@ -4,10 +4,12 @@ import java.time.OffsetDateTime; import java.util.List; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.peristence.v1.server.service.RedactionLogService; +import com.iqser.red.service.persistence.service.v1.api.model.redactionlog.FilteredRedactionLogRequest; import com.iqser.red.service.persistence.service.v1.api.resources.RedactionLogResource; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.SectionGrid; @@ -37,11 +39,8 @@ public class RedactionLogController implements RedactionLogResource { } public RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, - @RequestParam(value = "excludedType", required = false) List excludedTypes, - @RequestParam(value = "withManualRedactions", required = false, defaultValue = "true") boolean withManualRedactions, - @RequestParam(value = "includeFalsePositives", required = false, defaultValue = "false") boolean includeFalsePositives, - @RequestParam(value = "specifiedDate") OffsetDateTime specifiedDate) { - return redactionLogService.getFilteredRedactionLog(dossierId, fileId, excludedTypes, withManualRedactions, includeFalsePositives, specifiedDate); + @RequestBody FilteredRedactionLogRequest filteredRedactionLogRequest) { + return redactionLogService.getFilteredRedactionLog(dossierId, fileId, filteredRedactionLogRequest); } } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java index fe6d8f5d6..de12ac868 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java @@ -13,6 +13,7 @@ import com.iqser.red.service.peristence.v1.server.controller.DictionaryControlle import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment; +import com.iqser.red.service.persistence.service.v1.api.model.redactionlog.FilteredRedactionLogRequest; import com.iqser.red.service.redaction.v1.model.Change; import com.iqser.red.service.redaction.v1.model.ManualChange; import com.iqser.red.service.redaction.v1.model.RedactionLog; @@ -93,10 +94,13 @@ public class RedactionLogService { } - public RedactionLog getFilteredRedactionLog(String dossierId, String fileId, List excludedTypes, boolean withManualRedactions, boolean includeFalsePositives, - OffsetDateTime specifiedDate) { + public RedactionLog getFilteredRedactionLog(String dossierId, String fileId, FilteredRedactionLogRequest filteredRedactionLogRequest) { - var redactionLog = getRedactionLog(dossierId, fileId, excludedTypes, withManualRedactions, includeFalsePositives); + if(filteredRedactionLogRequest.getSpecifiedDate() == null) { + filteredRedactionLogRequest.setSpecifiedDate(OffsetDateTime.MIN); + } + + var redactionLog = getRedactionLog(dossierId, fileId, filteredRedactionLogRequest.getExcludedTypes(), filteredRedactionLogRequest.isWithManualRedactions(), filteredRedactionLogRequest.isIncludeFalsePositives()); List filteredRedactionLogEntries = new ArrayList<>(); RedactionLog filteredRedactionLog = new RedactionLog(redactionLog.getAnalysisVersion(), redactionLog.getAnalysisNumber(), filteredRedactionLogEntries, redactionLog.getLegalBasis(), redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion(), redactionLog.getRulesVersion(), redactionLog.getLegalBasisVersion()); @@ -135,7 +139,7 @@ public class RedactionLogService { var changes = redactionLogEntry.getChanges(); List filteredChanges = new ArrayList<>(); for (var change : changes) { - if (change.getDateTime().isAfter(specifiedDate)) { + if (change.getDateTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { filteredChanges.add(change); } } @@ -144,7 +148,7 @@ public class RedactionLogService { var manualChanges = redactionLogEntry.getManualChanges(); List filteredManualChanges = new ArrayList<>(); for (var manualChange: manualChanges){ - if(manualChange.getProcessedDate().isAfter(specifiedDate)) { + if(manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { filteredManualChanges.add(manualChange); } } @@ -152,12 +156,14 @@ public class RedactionLogService { var comments = redactionLogEntry.getComments(); List filteredComments = new ArrayList<>(); - for (var comment: comments) { - if(comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(specifiedDate) || comment.getDate().isAfter(specifiedDate)) { - filteredComments.add(comment); + if(comments != null) { + for (var comment : comments) { + if (comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || comment.getDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { + filteredComments.add(comment); + } } + frle.setComments(filteredComments); } - frle.setComments(filteredComments); filteredRedactionLogEntries.add(frle); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java index 7df97e7e7..4d65636f4 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RedactionLogTest.java @@ -11,6 +11,7 @@ import com.iqser.red.service.peristence.v1.server.integration.client.RedactionLo 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.redactionlog.FilteredRedactionLogRequest; public class RedactionLogTest extends AbstractPersistenceServerServiceTest { @@ -23,6 +24,7 @@ public class RedactionLogTest extends AbstractPersistenceServerServiceTest { @Autowired private RedactionLogClient redactionLogClient; + @Test public void testRedactionLog() { @@ -32,15 +34,12 @@ public class RedactionLogTest extends AbstractPersistenceServerServiceTest { assertThat(redactionLogClient.getSectionGrid(dossier.getId(), file.getId())).isNotNull(); assertThat(redactionLogClient.getRedactionLog(dossier.getId(), file.getId(), null, true, false)).isNotNull(); assertThat(redactionLogClient.getRedactionLog(dossier.getId(), file.getId(), null, false, false)).isNotNull(); - assertThat(redactionLogClient.getFilteredRedactionLog(dossier.getId(), file.getId(), null, true, false, OffsetDateTime.now())).isNotNull(); + assertThat(redactionLogClient.getFilteredRedactionLog(dossier.getId(), file.getId(), FilteredRedactionLogRequest.builder() + .excludedTypes(null) + .withManualRedactions(true) + .includeFalsePositives(false) + .specifiedDate(OffsetDateTime.now().minusDays(30)) + .build())).isNotNull(); } - @Test - public void testFilteredRedactionLog() { - - var dossier = dossierTesterAndProvider.provideTestDossier(); - var file = fileTesterAndProvider.testAndProvideFile(dossier); - - - } } From fabfffcf3da5c8a71d2f27cf9629c83a7e00a781 Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Fri, 1 Apr 2022 15:28:29 +0200 Subject: [PATCH 3/3] RED-3287: Improve RedactionLog Controller to allow incremental calls --- .../server/service/RedactionLogService.java | 77 +++++-------------- 1 file changed, 21 insertions(+), 56 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java index de12ac868..616ebd5fa 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java @@ -2,6 +2,7 @@ package com.iqser.red.service.peristence.v1.server.service; import java.time.OffsetDateTime; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; @@ -96,80 +97,44 @@ public class RedactionLogService { public RedactionLog getFilteredRedactionLog(String dossierId, String fileId, FilteredRedactionLogRequest filteredRedactionLogRequest) { - if(filteredRedactionLogRequest.getSpecifiedDate() == null) { + if (filteredRedactionLogRequest.getSpecifiedDate() == null) { filteredRedactionLogRequest.setSpecifiedDate(OffsetDateTime.MIN); } var redactionLog = getRedactionLog(dossierId, fileId, filteredRedactionLogRequest.getExcludedTypes(), filteredRedactionLogRequest.isWithManualRedactions(), filteredRedactionLogRequest.isIncludeFalsePositives()); + var redactionLogEntries = redactionLog.getRedactionLogEntry(); - List filteredRedactionLogEntries = new ArrayList<>(); - RedactionLog filteredRedactionLog = new RedactionLog(redactionLog.getAnalysisVersion(), redactionLog.getAnalysisNumber(), filteredRedactionLogEntries, redactionLog.getLegalBasis(), redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion(), redactionLog.getRulesVersion(), redactionLog.getLegalBasisVersion()); - - for (var redactionLogEntry : redactionLog.getRedactionLogEntry()) { - RedactionLogEntry frle = RedactionLogEntry.builder() - .id(redactionLogEntry.getId()) - .type(redactionLogEntry.getType()) - .value(redactionLogEntry.getValue()) - .reason(redactionLogEntry.getReason()) - .matchedRule(redactionLogEntry.getMatchedRule()) - .rectangle(redactionLogEntry.isRectangle()) - .legalBasis(redactionLogEntry.getLegalBasis()) - .imported(redactionLogEntry.isImported()) - .redacted(redactionLogEntry.isRedacted()) - .isHint(redactionLogEntry.isHint()) - .isRecommendation(redactionLogEntry.isRecommendation()) - .isFalsePositive(redactionLogEntry.isFalsePositive()) - .section(redactionLogEntry.getSection()) - .color(redactionLogEntry.getColor()) - .positions(redactionLogEntry.getPositions()) - .sectionNumber(redactionLogEntry.getSectionNumber()) - .textBefore(redactionLogEntry.getTextBefore()) - .textAfter(redactionLogEntry.getTextAfter()) - .startOffset(redactionLogEntry.getStartOffset()) - .endOffset(redactionLogEntry.getEndOffset()) - .isImage(redactionLogEntry.isImage()) - .imageHasTransparency(redactionLogEntry.isImageHasTransparency()) - .isDictionaryEntry(redactionLogEntry.isDictionaryEntry()) - .isDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry()) - .excluded(redactionLogEntry.isExcluded()) - .engines(redactionLogEntry.getEngines()) - .reference(redactionLogEntry.getReference()) - .build(); - - var changes = redactionLogEntry.getChanges(); - List filteredChanges = new ArrayList<>(); - for (var change : changes) { + Iterator it = redactionLogEntries.iterator(); + while (it.hasNext()) { + var redactionLogEntry = it.next(); + boolean isAfterSpecifiedDate = false; + for (var change : redactionLogEntry.getChanges()) { if (change.getDateTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { - filteredChanges.add(change); + isAfterSpecifiedDate = true; } } - frle.setChanges(filteredChanges); - - var manualChanges = redactionLogEntry.getManualChanges(); - List filteredManualChanges = new ArrayList<>(); - for (var manualChange: manualChanges){ - if(manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { - filteredManualChanges.add(manualChange); + for (var manualChange : redactionLogEntry.getManualChanges()) { + if (manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { + isAfterSpecifiedDate = true; } } - frle.setManualChanges(filteredManualChanges); - var comments = redactionLogEntry.getComments(); - List filteredComments = new ArrayList<>(); - if(comments != null) { + if (comments != null) { for (var comment : comments) { if (comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || comment.getDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) { - filteredComments.add(comment); + isAfterSpecifiedDate = true; } } - frle.setComments(filteredComments); } - filteredRedactionLogEntries.add(frle); - } - filteredRedactionLog.setRedactionLogEntry(filteredRedactionLogEntries); + if(!isAfterSpecifiedDate) { + it.remove(); + } - return filteredRedactionLog; + } + + return redactionLog; } + }