diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ManualRedactionController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ManualRedactionController.java index 719affe0d..d9c961de1 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ManualRedactionController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ManualRedactionController.java @@ -300,7 +300,9 @@ public class ManualRedactionController implements ManualRedactionResource { if (manualRedactionService.isLegalBasisChangeRequest(recategorizationRequestModel, entry.get())) { LegalBasisChangeRequestModel legalBasisChange = manualRedactionService.convertRecategorizationToLegalBasisChange(recategorizationRequestModel); legalBasisChanges.add(legalBasisChange); - } else { + } + + if(manualRedactionService.isRecategorizeRequest(recategorizationRequestModel, entry.get())) { recategorizations.add(recategorizationRequestModel); } } @@ -308,8 +310,8 @@ public class ManualRedactionController implements ManualRedactionResource { List responseList = new ArrayList<>(); - responseList.addAll(handleLegalBasisChanges(dossierId, fileId, legalBasisChanges)); responseList.addAll(handleRectegorizations(dossierId, fileId, recategorizations, includeUnprocessed, dossier.getDossierTemplateId())); + responseList.addAll(handleLegalBasisChanges(dossierId, fileId, legalBasisChanges)); return responseList; } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java index a2f9cd69a..87e8f7374 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java @@ -552,4 +552,10 @@ public class ManualRedactionService { return !ObjectUtils.isEmpty(requestModel.getLegalBasis()) && !requestModel.getLegalBasis().equals(entry.getLegalBasis()); } + + public boolean isRecategorizeRequest(RecategorizationRequestModel requestModel, EntityLogEntry entry) { + + return !ObjectUtils.isEmpty(requestModel.getType()) && !requestModel.getType().equals(entry.getType()); + } + }