diff --git a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts index bef982981..77f51737c 100644 --- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts @@ -7,7 +7,7 @@ plugins { } val redactionServiceVersion by rootProject.extra { "4.290.0" } -val pdftronRedactionServiceVersion by rootProject.extra { "4.78.3" } +val pdftronRedactionServiceVersion by rootProject.extra { "4.78.4" } val redactionReportServiceVersion by rootProject.extra { "4.73.6" } val searchServiceVersion by rootProject.extra { "2.90.0" } 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 24ef01a88..1b858bf9b 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 @@ -137,6 +137,7 @@ public class DownloadPreparationService { switch (downloadFileType) { case REDACTED -> result.add(RedactionType.REDACTED); case PREVIEW -> result.add(RedactionType.PREVIEW); + case OPTIMIZED_PREVIEW -> result.add(RedactionType.OPTIMIZED_PREVIEW); case DELTA_PREVIEW -> result.add(RedactionType.DELTA); default -> { } @@ -265,6 +266,10 @@ public class DownloadPreparationService { fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", addSuffix(filename, "highlighted"), // getPreview(file.getId(), redactionFileResult.get().getDetails()))); } + if (downloadFileType.name().equals(DownloadFileType.OPTIMIZED_PREVIEW.name())) { + fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Optimized Preview", addSuffix(filename, "optimized_highlighted"), // + getOptimizedPreview(file.getId(), redactionFileResult.get().getDetails()))); + } if (downloadFileType.name().equals(DownloadFileType.DELTA_PREVIEW.name())) { fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Delta Preview", addSuffix(filename, "delta_highlighted"), // getDeltaPreview(file.getId(), redactionFileResult.get().getDetails()))); @@ -329,6 +334,12 @@ public class DownloadPreparationService { } + private byte[] getOptimizedPreview(String fileId, List redactionResultDetails) { + + return getStoredFileBytes(fileId, redactionResultDetails, RedactionType.OPTIMIZED_PREVIEW); + } + + private void addReports(String downloadId, DownloadStatusEntity downloadStatus, List storedFileInformations,