From 06f7e57a74ee586e0ed9ad4923a39b4bbaa0422a Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 27 Aug 2024 15:03:26 +0200 Subject: [PATCH] RED-9790: manual changes not applied added logging --- .../controller/ManualRedactionController.java | 20 ---------------- .../ManualRedactionService.java | 23 ++++++++++++++++++- 2 files changed, 22 insertions(+), 21 deletions(-) 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 e5ec4a8f7..a6d2787af 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 @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.model.ManualChangesQueryOptions; import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService; import com.iqser.red.service.persistence.management.v1.processor.service.CommentService; @@ -183,9 +182,6 @@ public class ManualRedactionController implements ManualRedactionResource { .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); - if (responseList.isEmpty()) { - throw new BadRequestException("There were no manualRedactions added"); - } return ManualRedactionResponse.builder().manualAddResponses(responseList).build(); } @@ -220,9 +216,6 @@ public class ManualRedactionController implements ManualRedactionResource { .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); - if (responseList.isEmpty()) { - throw new BadRequestException("There were no manualRedactions removed"); - } return ManualRedactionResponse.builder().manualAddResponses(responseList).build(); } @@ -246,9 +239,6 @@ public class ManualRedactionController implements ManualRedactionResource { .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); - if (responseList.isEmpty()) { - throw new BadRequestException("There were no manualRedactions added"); - } return ManualRedactionResponse.builder().manualAddResponses(responseList).build(); } @@ -271,9 +261,6 @@ public class ManualRedactionController implements ManualRedactionResource { .message("Legal basis reason was changed") .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); - if (responseList.isEmpty()) { - throw new BadRequestException("There were no manualRedactions changed "); - } return ManualRedactionResponse.builder().manualAddResponses(responseList).build(); } @@ -299,10 +286,6 @@ public class ManualRedactionController implements ManualRedactionResource { .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); - if (responseList.isEmpty()) { - throw new BadRequestException("There were no manualRedactions recategorized"); - } - return ManualRedactionResponse.builder().manualAddResponses(responseList).build(); } @@ -326,9 +309,6 @@ public class ManualRedactionController implements ManualRedactionResource { .message("Skipped annotation was resized to be redacted") .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); - if (responseList.isEmpty()) { - throw new BadRequestException("There were no manualRedactions resized"); - } return ManualRedactionResponse.builder().manualAddResponses(responseList).build(); } 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 d1c6fe765..6ca117fb6 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 @@ -63,7 +63,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.RemoveRedactionRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ResizeRedactionRequest; -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange; @@ -119,6 +118,10 @@ public class ManualRedactionService { @Observed(name = "ManualRedactionService", contextualName = "add-manual-redaction") public List addAddRedaction(String dossierId, String fileId, Set addRedactionRequests, Dossier dossier) { + if (addRedactionRequests.isEmpty()) { + throw new BadRequestException("add redaction requests is empty for request: dossierId:" + dossierId + "fileId:" + fileId); + } + var response = new ArrayList(); List manualRedactionEntryEntities = new ArrayList<>(); List requests = manualRedactionMapper.toAddRedactionRequestList(dossierId, addRedactionRequests, dossier); @@ -199,6 +202,9 @@ public class ManualRedactionService { String dossierTemplateId, boolean includeUnprocessed) { + if (removeRedactionRequests.isEmpty()) { + throw new BadRequestException("remove redaction requests is empty for request: dossierId:" + dossierId + "fileId:" + fileId); + } var numberOfDictRemoves = removeRedactionRequests.stream() .filter(removeRedactionRequestModel -> removeRedactionRequestModel.isRemoveFromDictionary() || removeRedactionRequestModel.isRemoveFromAllDossiers()) .count(); @@ -282,6 +288,9 @@ public class ManualRedactionService { @Transactional public List addForceRedaction(String dossierId, String fileId, Set forceRedactionRequests) { + if (forceRedactionRequests.isEmpty()) { + throw new BadRequestException("force redaction requests is empty for request: dossierId:" + dossierId + "fileId:" + fileId); + } var response = new ArrayList(); dossierPersistenceService.getAndValidateDossier(dossierId); List> requests = manualRedactionMapper.toForceRedactionRequestList(dossierId, @@ -316,6 +325,10 @@ public class ManualRedactionService { @Transactional public List addLegalBasisChange(String dossierId, String fileId, Set legalBasisChangeRequests) { + if (legalBasisChangeRequests.isEmpty()) { + throw new BadRequestException("legal absis change requests is empty for request: dossierId:" + dossierId + "fileId:" + fileId); + } + var response = new ArrayList(); dossierPersistenceService.getAndValidateDossier(dossierId); List> requests = manualRedactionMapper.toLegalBasisChangeRequestList(dossierId, @@ -352,6 +365,10 @@ public class ManualRedactionService { Set recategorizationRequests, boolean includeUnprocessed) { + if (recategorizationRequests.isEmpty()) { + throw new BadRequestException("recat redaction requests is empty for request: dossierId:" + dossierId + "fileId:" + fileId); + } + var response = new ArrayList(); dossierPersistenceService.getAndValidateDossier(dossierId); var dossierEntity = dossierPersistenceService.getAndValidateDossier(dossierId); @@ -417,6 +434,10 @@ public class ManualRedactionService { @Observed(name = "ManualRedactionService", contextualName = "add-manual-redaction") public List addResizeRedaction(String dossierId, String fileId, Set resizeRedactionRequests, boolean includeUnprocessed) { + if (resizeRedactionRequests.isEmpty()) { + throw new BadRequestException("resize redaction requests is empty for request: dossierId:" + dossierId + "fileId:" + fileId); + } + List response = new ArrayList<>(); List manualResizeRedactionEntities = new ArrayList<>(); List> requests = manualRedactionMapper.toResizeRedactionRequestList(dossierId,