Compare commits

...

4 Commits

Author SHA1 Message Date
Andrei Isvoran
c88e5b40a7 RED-7784 - Unprocessed Redactions
* Set processed date for legalbasis and resize redactions
2023-11-09 11:34:53 +02:00
Andrei Isvoran
236dd06a19 Merge branch 'master' into RED-7784 2023-11-08 10:36:00 +02:00
Andrei Isvoran
3bf763f935 RED-7784 - Report with unprocessed redactions 2023-11-08 10:35:11 +02:00
Andrei Isvoran
c8c464196a RED-7784 - Report with unprocessed redactions
* Fix PMD
2023-11-07 13:31:51 +02:00
4 changed files with 13 additions and 3 deletions

View File

@ -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);
});

View File

@ -38,6 +38,11 @@ public class LegalBasisChangePersistenceService {
BeanUtils.copyProperties(legalBasisChangeRequest, manualLegalBasisChange);
manualLegalBasisChange.setRequestDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
if (legalBasisChangeRequest.getStatus() == AnnotationStatus.APPROVED) {
manualLegalBasisChange.setProcessedDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
}
return legalBasisChangeRepository.saveAndFlush(manualLegalBasisChange);
}

View File

@ -38,6 +38,11 @@ public class ResizeRedactionPersistenceService {
manualResizeRedaction.setPositions(MagicConverter.convert(resizeRedactionRequest.getPositions(), RectangleEntity.class));
manualResizeRedaction.setRequestDate(OffsetDateTime.now());
if (manualResizeRedaction.getStatus()
.equals(AnnotationStatus.APPROVED) && (manualResizeRedaction.getUpdateDictionary() == null || !manualResizeRedaction.getUpdateDictionary())) {
manualResizeRedaction.setProcessedDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
}
return resizeRedactionRepository.saveAndFlush(manualResizeRedaction);
}

View File

@ -33,8 +33,8 @@
<properties>
<redaction-service.version>4.165.0</redaction-service.version>
<search-service.version>2.71.0</search-service.version>
<pdftron-redaction-service.version>4.29.0</pdftron-redaction-service.version>
<redaction-report-service.version>4.30.0</redaction-report-service.version>
<pdftron-redaction-service.version>4.38.0</pdftron-redaction-service.version>
<redaction-report-service.version>4.31.0</redaction-report-service.version>
<ocr-service.version>3.10.0</ocr-service.version>
<storage.commons.version>2.45.0</storage.commons.version>
</properties>