From 0856c542bc211070f83f224bfdbdccb17ae502c2 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 29 Sep 2021 16:34:04 +0300 Subject: [PATCH] typeId to type internal refactor --- .../redaction-service-api-v1/pom.xml | 2 +- .../redaction/v1/model/RedactionLogEntry.java | 2 +- .../redaction/service/AnalyzeService.java | 2 +- .../redaction/service/DictionaryService.java | 2 +- .../service/RedactionLogCreatorService.java | 4 ++-- .../service/RedactionLogMergeService.java | 24 +++++++------------ .../v1/server/RedactionIntegrationTest.java | 8 +------ 7 files changed, 16 insertions(+), 28 deletions(-) diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml index 60814793..470de21b 100644 --- a/redaction-service-v1/redaction-service-api-v1/pom.xml +++ b/redaction-service-v1/redaction-service-api-v1/pom.xml @@ -20,7 +20,7 @@ com.iqser.red.service persistence-service-api-v1 - 0.16.0 + 0.22.0 diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java index 09004c24..7a7610e1 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java @@ -22,7 +22,7 @@ import java.util.Set; public class RedactionLogEntry { private String id; - private String typeId; + private String type; private String value; private String reason; private int matchedRule; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java index e8720742..9815aabb 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java @@ -254,7 +254,7 @@ public class AnalyzeService { Rectangle position = entry.getPositions().get(0); return Image.builder() - .type(entry.getTypeId().split(":")[0]) + .type(entry.getType()) .position(new RedRectangle2D(position.getTopLeft().getX(), position.getTopLeft() .getY(), position.getWidth(), position.getHeight())) .sectionNumber(entry.getSectionNumber()) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java index 89798b4f..d28cbc29 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java @@ -84,7 +84,7 @@ public class DictionaryService { DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation(); var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId); - if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse)) { + if (CollectionUtils.isNotEmpty(typeResponse)) { List dictionary = typeResponse .stream() 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 32dc1664..20fb69a1 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 @@ -62,7 +62,7 @@ public class RedactionLogCreatorService { .id(id) .color(getColor(image.getType(), dossierTemplateId, image.isRedaction())) .isImage(true) - .typeId(IdBuilder.getTypeId(image.getType(), dossierTemplateId, null)) + .type(image.getType()) .redacted(image.isRedaction()) .reason(image.getRedactionReason()) .legalBasis(image.getLegalBasis()) @@ -167,7 +167,7 @@ public class RedactionLogCreatorService { .reason(entity.getRedactionReason()) .legalBasis(entity.getLegalBasis()) .value(entity.getWord()) - .typeId(IdBuilder.getTypeId(entity.getType(), dossierTemplateId, entity.isDossierDictionaryEntry() ? dossierId : null)) + .type(entity.getType()) .redacted(entity.isRedaction()) .isHint(isHint(entity.getType(), dossierTemplateId)) .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId)) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java index 67928320..e9e82152 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java @@ -110,12 +110,12 @@ public class RedactionLogMergeService { String manualOverrideReason = null; if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) { redactionLogEntry.setStatus(AnnotationStatus.APPROVED); - redactionLogEntry.setTypeId(IdBuilder.getTypeId(imageRecategorization.getType(), dossierTemplateId, null)); + redactionLogEntry.setType(imageRecategorization.getType()); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override"); } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize"); redactionLogEntry.setStatus(AnnotationStatus.REQUESTED); - redactionLogEntry.setColor(getColor(getTypeFromTypeId(redactionLogEntry.getTypeId()), dossierTemplateId, false, redactionLogEntry + redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry .isRedacted(), false)); redactionLogEntry.setRecategorizationType(imageRecategorization.getType()); } else { @@ -135,12 +135,12 @@ public class RedactionLogMergeService { redactionLogEntry.setRedacted(false); redactionLogEntry.setStatus(AnnotationStatus.APPROVED); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override"); - redactionLogEntry.setColor(getColor(getTypeFromTypeId(redactionLogEntry.getTypeId()), dossierTemplateId, false, redactionLogEntry + redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry .isRedacted(), true)); } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove"); redactionLogEntry.setStatus(AnnotationStatus.REQUESTED); - redactionLogEntry.setColor(getColor(getTypeFromTypeId(redactionLogEntry.getTypeId()), dossierTemplateId, true, redactionLogEntry + redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry .isRedacted(), false)); } else { redactionLogEntry.setStatus(AnnotationStatus.DECLINED); @@ -160,14 +160,14 @@ public class RedactionLogMergeService { if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) { redactionLogEntry.setRedacted(true); redactionLogEntry.setStatus(AnnotationStatus.APPROVED); - redactionLogEntry.setColor(getColor(getTypeFromTypeId(redactionLogEntry.getTypeId()), dossierTemplateId, false, redactionLogEntry + redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry .isRedacted(), false)); manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override"); redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis()); } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact"); redactionLogEntry.setStatus(AnnotationStatus.REQUESTED); - redactionLogEntry.setColor(getColor(getTypeFromTypeId(redactionLogEntry.getTypeId()), dossierTemplateId, true, redactionLogEntry + redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry .isRedacted(), false)); redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis()); } else { @@ -191,7 +191,7 @@ public class RedactionLogMergeService { } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) { manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested"); redactionLogEntry.setStatus(AnnotationStatus.REQUESTED); - redactionLogEntry.setColor(getColor(getTypeFromTypeId(redactionLogEntry.getTypeId()), dossierTemplateId, true, redactionLogEntry + redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry .isRedacted(), false)); redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis()); } else { @@ -258,13 +258,13 @@ public class RedactionLogMergeService { return RedactionLogEntry.builder() .id(id) - .color(getColorForManualAdd(getTypeFromTypeId(manualRedactionEntry.getTypeId()), dossierTemplateId, manualRedactionEntry.getStatus())) + .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus())) .reason(manualRedactionEntry.getReason()) .isDictionaryEntry(manualRedactionEntry.isAddToDictionary()) .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary()) .legalBasis(manualRedactionEntry.getLegalBasis()) .value(manualRedactionEntry.getValue()) - .typeId(manualRedactionEntry.getTypeId()) + .type(manualRedactionEntry.getType()) .redacted(true) .isHint(false) .section(null) @@ -324,12 +324,6 @@ public class RedactionLogMergeService { } - private String getTypeFromTypeId(String typeId){ - return typeId.split(":")[0]; - } - - - } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index a6486147..11ade117 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -682,12 +682,6 @@ public class RedactionIntegrationTest { var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID); var text = redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID); - redactionLog.getRedactionLogEntry().forEach(entry -> { - if (entry.isImage()) { - System.out.println("---->" + entry.getTypeId()); - } - }); - long end = System.currentTimeMillis(); System.out.println("first analysis duration: " + (end - start)); @@ -848,7 +842,7 @@ public class RedactionIntegrationTest { manualRedactionEntry.setAnnotationId(manualAddId); manualRedactionEntry.setFileId("fileId"); manualRedactionEntry.setStatus(AnnotationStatus.REQUESTED); - manualRedactionEntry.setTypeId("name:" + TEST_DOSSIER_TEMPLATE_ID); + manualRedactionEntry.setType("name"); manualRedactionEntry.setValue("O'Loughlin C.K."); manualRedactionEntry.setReason("Manual Redaction"); manualRedactionEntry.setPositions(List.of(Rectangle