From 279fdc69854224d145cc4045803c9985fe932ce9 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 13 Jul 2021 11:34:08 +0300 Subject: [PATCH 1/4] added dates to model classes for manual redactions --- .../iqser/red/service/redaction/v1/model/IdRemoval.java | 8 +++++++- .../red/service/redaction/v1/model/ManualForceRedact.java | 8 +++++++- .../redaction/v1/model/ManualImageRecategorization.java | 8 +++++++- .../redaction/v1/model/ManualLegalBasisChange.java | 8 +++++++- .../service/redaction/v1/model/ManualRedactionEntry.java | 5 +++++ .../redaction/service/RedactionLogCreatorService.java | 2 ++ 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/IdRemoval.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/IdRemoval.java index 2b7b506d..ff5a7329 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/IdRemoval.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/IdRemoval.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; + @Data @Builder @AllArgsConstructor @@ -16,4 +18,8 @@ public class IdRemoval { private Status status; private boolean removeFromDictionary; -} \ No newline at end of file + private OffsetDateTime requestDate; + private OffsetDateTime processedDate; + private OffsetDateTime softDeletedTime; + +} diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualForceRedact.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualForceRedact.java index 3af345dd..c005e6d3 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualForceRedact.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualForceRedact.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; + @Data @Builder @AllArgsConstructor @@ -16,4 +18,8 @@ public class ManualForceRedact { private Status status; private String legalBasis; -} \ No newline at end of file + private OffsetDateTime requestDate; + private OffsetDateTime processedDate; + private OffsetDateTime softDeletedTime; + +} diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualImageRecategorization.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualImageRecategorization.java index 7dc9120c..17e07f5c 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualImageRecategorization.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualImageRecategorization.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; + @Data @Builder @AllArgsConstructor @@ -18,4 +20,8 @@ public class ManualImageRecategorization { private String legalBasis; private boolean redacted; -} \ No newline at end of file + private OffsetDateTime requestDate; + private OffsetDateTime processedDate; + private OffsetDateTime softDeletedTime; + +} diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java index 4f0d211f..39210d07 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; + @Data @Builder @AllArgsConstructor @@ -16,4 +18,8 @@ public class ManualLegalBasisChange { private Status status; private String legalBasis; -} \ No newline at end of file + private OffsetDateTime requestDate; + private OffsetDateTime processedDate; + private OffsetDateTime softDeletedTime; + +} diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java index eb4fbecf..df14617b 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java @@ -5,6 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; @@ -29,4 +30,8 @@ public class ManualRedactionEntry { private boolean addToDossierDictionary; + private OffsetDateTime requestDate; + private OffsetDateTime processedDate; + private OffsetDateTime softDeletedTime; + } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java index a83d3751..fe4e95c1 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java @@ -641,6 +641,8 @@ public class RedactionLogCreatorService { redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); redactionLogEntry.setPositions(manualRedaction.getPositions()); + manualRedaction. + var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); if (found.isPresent()) { found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); From af46bdca90aab6aab9e3ac5c5a9808f8eea8c760 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 13 Jul 2021 11:35:18 +0300 Subject: [PATCH 2/4] handling add to dict requests --- .../service/RedactionLogCreatorService.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java index fe4e95c1..aa60d857 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java @@ -635,24 +635,26 @@ public class RedactionLogCreatorService { for (var manualRedaction : manualRedactions.getEntriesToAdd()) { - if (manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) { - var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId); - redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - redactionLogEntry.setPositions(manualRedaction.getPositions()); + if (manualRedaction.getProcessedDate() == null) { + + if (manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) { + var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId); + redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + redactionLogEntry.setPositions(manualRedaction.getPositions()); + + + var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); + if (found.isPresent()) { + found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + found.get().setPositions(manualRedaction.getPositions()); + } else { + redactionLog.getRedactionLogEntry().add(redactionLogEntry); + } - manualRedaction. - var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); - if (found.isPresent()) { - found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - found.get().setPositions(manualRedaction.getPositions()); - } else { - redactionLog.getRedactionLogEntry().add(redactionLogEntry); } - - } } } From 2d0a6d4d29034c1afee5a122a87135614e099fbd Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 13 Jul 2021 11:39:44 +0300 Subject: [PATCH 3/4] fixed pmd --- .../service/RedactionLogCreatorService.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java index aa60d857..ee628067 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java @@ -635,26 +635,24 @@ public class RedactionLogCreatorService { for (var manualRedaction : manualRedactions.getEntriesToAdd()) { - if (manualRedaction.getProcessedDate() == null) { - - if (manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) { - var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId); - redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - redactionLogEntry.setPositions(manualRedaction.getPositions()); - - - var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); - if (found.isPresent()) { - found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); - found.get().setPositions(manualRedaction.getPositions()); - } else { - redactionLog.getRedactionLogEntry().add(redactionLogEntry); - } + // not yet processed, and dictionary modifying, show in redaction-log preview + if (manualRedaction.getProcessedDate() == null && manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) { + var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId); + redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + redactionLogEntry.setPositions(manualRedaction.getPositions()); + var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny(); + if (found.isPresent()) { + found.get().setDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary()); + found.get().setPositions(manualRedaction.getPositions()); + } else { + redactionLog.getRedactionLogEntry().add(redactionLogEntry); } + + } } } From 9da43429393a875b82e0ea73dfcd8093bede91c5 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 13 Jul 2021 12:43:07 +0300 Subject: [PATCH 4/4] changed to fonts 3.8 to fix build --- redaction-service-image-v1/src/main/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redaction-service-image-v1/src/main/docker/Dockerfile b/redaction-service-image-v1/src/main/docker/Dockerfile index 3ab50727..dec2d219 100644 --- a/redaction-service-image-v1/src/main/docker/Dockerfile +++ b/redaction-service-image-v1/src/main/docker/Dockerfile @@ -13,6 +13,6 @@ RUN apt-get update \ wget cabextract xfonts-utils fonts-liberation \ && rm -rf /var/lib/apt/lists/* -RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \ - && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \ - && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \ +RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \ + && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \ + && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \