From 29fc2b63c259de9aea1603b2384e5b56dcce5eab Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 25 Apr 2024 17:44:27 +0200 Subject: [PATCH] RED-9042-bp: merge manual-legal-basis-change functionality into recategorize * fix nullpointer in isHint --- .../v1/processor/service/EntityLogMergeService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java index fbdc9e042..5f94b5d38 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java @@ -338,23 +338,23 @@ public class EntityLogMergeService { private EntityLogEntry mergeRecategorization(ManualRecategorization recategorization, EntityLogEntry entityLogEntry, DossierEntity dossier, int analysisNumber) { - if ((recategorization.getType() != null && !Objects.equals(recategorization.getType(), entityLogEntry.getType()) && Strings.isNullOrEmpty(recategorization.getLegalBasis()))// + if ((recategorization.getType() != null && !Objects.equals(recategorization.getType(), entityLogEntry.getType()) && Strings.isNullOrEmpty(recategorization.getLegalBasis())) && (entityLogEntry.getEntryType().equals(EntryType.IMAGE) || entityLogEntry.getEntryType().equals(EntryType.IMAGE_HINT))) { return pendingDictionaryEntryFactory.buildPendingImageRecategorizationEntry(recategorization, entityLogEntry); } - boolean isHint = isHint(recategorization.getType(), dossier); - entityLogEntry.getEngines().add(Engine.MANUAL); if (recategorization.getType() != null && !recategorization.getType().equals(entityLogEntry.getType())) { + boolean isHint = isHint(recategorization.getType(), dossier); entityLogEntry.setType(recategorization.getType()); entityLogEntry.setEntryType(getEntryType(isHint, recategorization.getType())); entityLogEntry.setState(EntryState.SKIPPED); } if (!Strings.isNullOrEmpty(recategorization.getLegalBasis())) { + boolean isHint = isHint(entityLogEntry.getType(), dossier); entityLogEntry.setLegalBasis(recategorization.getLegalBasis()); entityLogEntry.setState(isHint ? EntryState.SKIPPED : EntryState.APPLIED); }