From c8c464196a3df80f5f3de0a94e9091fd9e296180 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Tue, 7 Nov 2023 13:31:51 +0200 Subject: [PATCH 1/2] RED-7784 - Report with unprocessed redactions * Fix PMD --- ...onServiceSaasMigrationMessageReceiver.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionServiceSaasMigrationMessageReceiver.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionServiceSaasMigrationMessageReceiver.java index a4ee11967..be3d50c6d 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionServiceSaasMigrationMessageReceiver.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionServiceSaasMigrationMessageReceiver.java @@ -1,18 +1,22 @@ package com.iqser.red.service.persistence.management.v1.processor.service.queue; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration; -import com.iqser.red.service.persistence.management.v1.processor.migration.SaasMigrationService; -import com.iqser.red.service.redaction.v1.model.MigrationRequest; -import com.iqser.red.service.redaction.v1.model.MigrationResponse; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; +import static com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration.MIGRATION_DLQ; +import static com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration.MIGRATION_QUEUE; +import static com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration.MIGRATION_RESPONSE_QUEUE; +import static com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration.X_ERROR_INFO_HEADER; + import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Service; -import static com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration.*; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.iqser.red.service.persistence.management.v1.processor.migration.SaasMigrationService; +import com.iqser.red.service.redaction.v1.model.MigrationRequest; +import com.iqser.red.service.redaction.v1.model.MigrationResponse; + +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; @Slf4j @Service @@ -37,7 +41,7 @@ public class RedactionServiceSaasMigrationMessageReceiver { public void handleDLQMessage(Message failedMessage) { var migrationRequest = objectMapper.readValue(failedMessage.getBody(), MigrationRequest.class); - String errorCause = failedMessage.getMessageProperties().getHeader(MessagingConfiguration.X_ERROR_INFO_HEADER); + String errorCause = failedMessage.getMessageProperties().getHeader(X_ERROR_INFO_HEADER); saasMigrationService.handleError(migrationRequest.getDossierId(), migrationRequest.getFileId(), errorCause, MIGRATION_QUEUE); } -- 2.47.2 From 3bf763f93587cc2520a7df4b99bae88fca777660 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 8 Nov 2023 10:35:11 +0200 Subject: [PATCH 2/2] RED-7784 - Report with unprocessed redactions --- .../service/download/DownloadPreparationService.java | 2 +- persistence-service-v1/pom.xml | 4 ++-- 2 files 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/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java index 65e583478..85beda749 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java @@ -71,7 +71,7 @@ public class DownloadPreparationService { downloadStatus.getFiles().forEach(fileEntity -> { - RedactionMessage message = messageBuilder.fileId(fileEntity.getId()).unapprovedFile(fileEntity.getWorkflowStatus() != WorkflowStatus.APPROVED).build(); + RedactionMessage message = messageBuilder.fileId(fileEntity.getId()).unapprovedFile(fileEntity.getWorkflowStatus() != WorkflowStatus.APPROVED).includeUnprocessed(reportResultMessage.isIncludeUnprocessed()).build(); log.info("Sending redaction request for downloadId:{} fileId:{} to pdftron-redaction-queue", downloadId, fileEntity.getId()); rabbitTemplate.convertAndSend(MessagingConfiguration.PDFTRON_QUEUE, message); }); diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 592b8be79..7f35315ca 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -33,8 +33,8 @@ 4.165.0 2.71.0 - 4.29.0 - 4.30.0 + 4.38.0 + 4.31.0 3.10.0 2.45.0 -- 2.47.2