From a6b25f6f58a65f3f6d0455c30aa182f86590117f Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Thu, 28 Mar 2024 15:39:06 +0100 Subject: [PATCH] RED-8702: Explore document databases to store entityLog * fix for analysisnumber 1 as first --- .../service/redaction/v1/server/service/AnalyzeService.java | 5 +++-- .../redaction/v1/server/RedactionIntegrationTest.java | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java index 4f21309f..8f56b484 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java @@ -265,8 +265,9 @@ public class AnalyzeService { EntityLog entityLog = entityLogChanges.getEntityLog(); // hotfix for tests : analysis numbers should be incremented in every follow-up request, - // then querying if the entity log exists would not be necessary - if (entityLog.getAnalysisNumber() <= 0 && !redactionStorageService.entityLogExists(analyzeRequest.getDossierId(), analyzeRequest.getFileId())) { + // then querying if the entity log exists would not be necessary something like this could be done instead: + // entityLog.getAnalysisNumber() <= 0 + if (!redactionStorageService.entityLogExists(analyzeRequest.getDossierId(), analyzeRequest.getFileId())) { redactionStorageService.insertEntityLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), entityLog); } else { 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 53eb15d1..6fc83642 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 @@ -608,6 +608,7 @@ public class RedactionIntegrationTest extends RulesIntegrationTest { .build())); analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request); + request.setAnalysisNumber(1); AnalyzeResult result = analyzeService.analyze(request); var entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID); @@ -666,7 +667,7 @@ public class RedactionIntegrationTest extends RulesIntegrationTest { .build())); request.setManualRedactions(manualRedactions); - + request.setAnalysisNumber(2); AnalyzeResult reanalyzeResult = analyzeService.reanalyze(request); entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID); @@ -688,6 +689,7 @@ public class RedactionIntegrationTest extends RulesIntegrationTest { when(dictionaryClient.getDictionaryForType(VERTEBRATE_INDICATOR, null)).thenReturn(getDictionaryResponse(VERTEBRATE_INDICATOR, false)); + request.setAnalysisNumber(3); analyzeService.reanalyze(request); entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID);