From 73afa0f349b44395e0ef8cad7cd41ad1e462cf1a Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 4 Sep 2023 12:06:27 +0200 Subject: [PATCH 1/3] RED-7317: set DictionaryEntryType to ENTRY by default --- .../api/impl/controller/ManualRedactionController.java | 1 + .../v1/api/shared/model/manual/AddRedactionRequestModel.java | 5 +++-- 2 files changed, 4 insertions(+), 2 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 cb25ea62e..d24f54d56 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 @@ -169,6 +169,7 @@ public class ManualRedactionController implements ManualRedactionResource { .message("Manual redaction was added.") .details(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, ANNOTATION_ID, response.getAnnotationId())) .build())); + return responseList; } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java index 801dc95d1..e6d0e7d33 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java @@ -45,7 +45,8 @@ public class AddRedactionRequestModel { private boolean rectangle; private String sourceId; - - private DictionaryEntryType dictionaryEntryType; + + @Builder.Default + private DictionaryEntryType dictionaryEntryType = DictionaryEntryType.ENTRY; } -- 2.47.2 From 067d3e49baa688f8e2c9b61355587777f3578b67 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 4 Sep 2023 13:47:59 +0200 Subject: [PATCH 2/3] RED-7317: change endpoint descriptions --- .../v1/api/external/resource/ManualRedactionResource.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ManualRedactionResource.java b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ManualRedactionResource.java index 93904a9cd..df1a6fa61 100644 --- a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ManualRedactionResource.java +++ b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ManualRedactionResource.java @@ -110,7 +110,7 @@ public interface ManualRedactionResource { @ResponseStatus(value = HttpStatus.OK) @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/bulk/redaction/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(summary = "Recategorizes the images list", description = "None") + @Operation(summary = "Recategorizes the list of redaction log entries", description = "None") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")}) List recategorizeBulk(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @@ -126,7 +126,6 @@ public interface ManualRedactionResource { @RequestBody Set resizeRedactionRequests); - @ResponseStatus(value = HttpStatus.OK) @GetMapping(value = MANUAL_REDACTION_REST_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) @Operation(summary = "Returns the manual redactions", description = "None") @@ -134,7 +133,6 @@ public interface ManualRedactionResource { ManualRedactions getManualRedactions(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId); - @ResponseStatus(value = HttpStatus.OK) @GetMapping(value = MANUAL_REDACTION_REST_PATH + "/comments" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) @Operation(summary = "Returns the comments for a specific file", description = "None") -- 2.47.2 From 39172c2da2e1883d6260eada9cfc37cf80f8720a Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 4 Sep 2023 14:46:21 +0200 Subject: [PATCH 3/3] RED-7317: reprocess when legalBasisChange --- .../service/manualredactions/ManualRedactionService.java | 1 + 1 file changed, 1 insertion(+) 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 32ff66931..b8e84e4fe 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 @@ -204,6 +204,7 @@ public class ManualRedactionService { response.add(ManualAddResponse.builder().annotationId(legalBasisChangeRequest.getAnnotationId()).commentId(commentId).build()); } + reprocess(dossierId, fileId); analysisFlagsCalculationService.calculateFlags(dossierId, fileId); return response; -- 2.47.2