From 781b761aad40c3a9b512b39a8702f6ed7ef33e99 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Tue, 10 Oct 2023 10:27:10 +0200 Subject: [PATCH] DM-504: always exclude hard deleted files * adjusted error message * also removed annotationStatus since it is always APPROVED anyway * removed inactive options from FilteredEntityLogRequest --- .../v2/external/api/impl/controller/FileControllerV2.java | 2 +- .../management/v1/processor/service/EntityLogService.java | 7 +++---- .../service/layoutparsing/LayoutParsingRequestFactory.java | 1 - .../analysislog/entitylog/FilteredEntityLogRequest.java | 2 -- .../shared/model/analysislog/entitylog/ManualChange.java | 3 --- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/FileControllerV2.java b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/FileControllerV2.java index b91db32f4..ff8d1ef04 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/FileControllerV2.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/FileControllerV2.java @@ -98,7 +98,7 @@ public class FileControllerV2 implements FileResource { FileStatus status = statusController.getFileStatus(dossierId, fileId); if (status.getHardDeletedTime() != null) { - throw new NotFoundException(String.format("The requested file has been hard deleted on %s.", status.getHardDeletedTime().format(DateTimeFormatter.ISO_LOCAL_DATE))); + throw new NotFoundException("File not found"); } if (!includeSoftDeleted && status.getSoftDeletedTime() != null) { diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java index bac3d8a3b..7a430f428 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java @@ -41,7 +41,7 @@ public class EntityLogService { } if (excludedTypes != null) { - redactionLog.getEntityLogEntry().removeIf(nextEntry -> excludedTypes.contains(nextEntry.getType())); + redactionLog.getEntityLogEntry().removeIf(entry -> excludedTypes.contains(entry.getType())); } return redactionLog; @@ -68,9 +68,8 @@ public class EntityLogService { } } for (var manualChange : redactionLogEntry.getManualChanges()) { - if (manualChange.getProcessedDate() != null && manualChange.getProcessedDate() - .isAfter(filteredEntityLogRequest.getSpecifiedDate()) || manualChange.getRequestedDate() != null && manualChange.getRequestedDate() - .isAfter(filteredEntityLogRequest.getSpecifiedDate())) { + if (manualChange.getProcessedDate() != null && manualChange.getProcessedDate().isAfter(filteredEntityLogRequest.getSpecifiedDate()) || // + manualChange.getRequestedDate() != null && manualChange.getRequestedDate().isAfter(filteredEntityLogRequest.getSpecifiedDate())) { isAfterSpecifiedDate = true; break; } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java index d9b80c8df..5936ed66d 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java @@ -1,6 +1,5 @@ package com.iqser.red.service.persistence.management.v1.processor.service.layoutparsing; -import java.util.Map; import java.util.Optional; import org.springframework.beans.factory.annotation.Value; diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/FilteredEntityLogRequest.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/FilteredEntityLogRequest.java index bcd2708fc..a1bf57add 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/FilteredEntityLogRequest.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/FilteredEntityLogRequest.java @@ -15,8 +15,6 @@ import lombok.NoArgsConstructor; public class FilteredEntityLogRequest { private List excludedTypes; - private boolean withManualRedactions; - private boolean includeFalsePositives; private OffsetDateTime specifiedDate; } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/ManualChange.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/ManualChange.java index d6a25d5bb..05bd44e24 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/ManualChange.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/ManualChange.java @@ -4,7 +4,6 @@ import java.time.OffsetDateTime; import java.util.HashMap; import java.util.Map; -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation; import lombok.AllArgsConstructor; @@ -18,7 +17,6 @@ import lombok.NoArgsConstructor; @Builder public class ManualChange { - private AnnotationStatus annotationStatus; private ManualRedactionType manualRedactionType; private OffsetDateTime processedDate; private OffsetDateTime requestedDate; @@ -29,7 +27,6 @@ public class ManualChange { public static ManualChange from(BaseAnnotation baseAnnotation) { ManualChange manualChange = new ManualChange(); - manualChange.annotationStatus = baseAnnotation.getStatus(); manualChange.processedDate = baseAnnotation.getProcessedDate(); manualChange.requestedDate = baseAnnotation.getRequestDate(); manualChange.userId = baseAnnotation.getUser();