Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-9037: changed logic to consider both recategorization and legal basis change in same request #461

Open
ali.oezyetimoglu1 wants to merge 1 commits from RED-9037 into master
pull from: RED-9037
merge into: Marmelator:master
Conversation 1 Commits 1 Files Changed 2 +10 -2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ManualRedactionController.java vendored
View File

@ -300,7 +300,9 @@ public class ManualRedactionController implements ManualRedactionResource {
if (manualRedactionService.isLegalBasisChangeRequest(recategorizationRequestModel, entry.get())) { if (manualRedactionService.isLegalBasisChangeRequest(recategorizationRequestModel, entry.get())) {
LegalBasisChangeRequestModel legalBasisChange = manualRedactionService.convertRecategorizationToLegalBasisChange(recategorizationRequestModel); LegalBasisChangeRequestModel legalBasisChange = manualRedactionService.convertRecategorizationToLegalBasisChange(recategorizationRequestModel);
legalBasisChanges.add(legalBasisChange); legalBasisChanges.add(legalBasisChange);
} else { }
if(manualRedactionService.isRecategorizeRequest(recategorizationRequestModel, entry.get())) {
recategorizations.add(recategorizationRequestModel); recategorizations.add(recategorizationRequestModel);
} }
} }
@ -308,8 +310,8 @@ public class ManualRedactionController implements ManualRedactionResource {
List<ManualAddResponse> responseList = new ArrayList<>(); List<ManualAddResponse> responseList = new ArrayList<>();
responseList.addAll(handleLegalBasisChanges(dossierId, fileId, legalBasisChanges));
responseList.addAll(handleRectegorizations(dossierId, fileId, recategorizations, includeUnprocessed, dossier.getDossierTemplateId())); responseList.addAll(handleRectegorizations(dossierId, fileId, recategorizations, includeUnprocessed, dossier.getDossierTemplateId()));
responseList.addAll(handleLegalBasisChanges(dossierId, fileId, legalBasisChanges));
return responseList; return responseList;
} }

6
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
View File

@ -552,4 +552,10 @@ public class ManualRedactionService {
return !ObjectUtils.isEmpty(requestModel.getLegalBasis()) && !requestModel.getLegalBasis().equals(entry.getLegalBasis()); 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());
}
} }