Merge branch 'RED-7784-flag-default' into 'master'

RED-7784 - Include unprocessed redactions in reports by default

Closes RED-7784

See merge request redactmanager/persistence-service!213

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java

@@ -103,6 +103,10 @@ public class DownloadController implements DownloadResource {
     @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
     public DownloadResponse prepareDownload(@RequestBody PrepareDownloadWithOptionRequest request) {
 
+        if (request.getIncludeUnprocessed() == null) {
+            request.setIncludeUnprocessed(true);
+        }
+
         validateDossierId(request.getDossierId());
 
         validateAndFilterFileIds(request);
@@ -174,7 +178,7 @@ public class DownloadController implements DownloadResource {
                 .downloadFileTypes(request.getDownloadFileTypes())
                 .reportTemplateIds(request.getReportTemplateIds())
                 .redactionPreviewColor(request.getRedactionPreviewColor())
-                .includeUnprocessed(request.isIncludeUnprocessed())
+                .includeUnprocessed(request.getIncludeUnprocessed())
                 .build();
     }
 
@@ -303,7 +307,7 @@ public class DownloadController implements DownloadResource {
                 .dossierId(request.getDossierId())
                 .userId(KeycloakSecurity.getUserId())
                 .fileIds(request.getFileIds())
-                .includeUnprocessed(request.isIncludeUnprocessed())
+                .includeUnprocessed(request.getIncludeUnprocessed())
                 .build();
     }
 

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/DownloadJob.java

@@ -14,6 +14,6 @@ public class DownloadJob {
 
     private String userId;
     private String storageId;
-    private boolean includeUnprocessed;
+    private Boolean includeUnprocessed;
 
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DownloadService.java

@@ -61,7 +61,7 @@ public class DownloadService {
                 .userId(request.getUserId())
                 .dossierId(request.getDossierId())
                 .fileIds(request.getFileIds())
-                .includeUnprocessed(request.isIncludeUnprocessed())
+                .includeUnprocessed(request.getIncludeUnprocessed())
                 .downloadFileTypes(dossier.getDownloadFileTypes())
                 .reportTemplateIds(dossier.getReportTemplates().stream().map(ReportTemplateEntity::getTemplateId).collect(Collectors.toList()))
                 .build();
@@ -85,7 +85,7 @@ public class DownloadService {
                 request.getDownloadFileTypes(),
                 request.getReportTemplateIds(),
                 request.getRedactionPreviewColor());
-        addToDownloadQueue(DownloadJob.builder().storageId(storageId).userId(request.getUserId()).includeUnprocessed(request.isIncludeUnprocessed()).build(), 1);
+        addToDownloadQueue(DownloadJob.builder().storageId(storageId).userId(request.getUserId()).includeUnprocessed(request.getIncludeUnprocessed()).build(), 1);
 
         return new JSONPrimitive<>(storageId);
     }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadProcessorService.java

@@ -52,7 +52,7 @@ public class DownloadProcessorService {
                 .downloadId(downloadJob.getStorageId())
                 .dossierId(dossier.getId())
                 .dossierTemplateId(dossierService.getDossierById(dossier.getId()).getDossierTemplateId())
-                .includeUnprocessed(downloadJob.isIncludeUnprocessed())
+                .includeUnprocessed(downloadJob.getIncludeUnprocessed())
                 .fileIds(filenameSortedFileIds)
                 .templateIds(downloadStatus.getReports().stream().map(ReportTemplateEntity::getTemplateId).collect(Collectors.toSet()))
                 .build(), 1);

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/PrepareDownloadRequest.java

@@ -18,6 +18,6 @@ public class PrepareDownloadRequest {
 
     private String dossierId;
     private List<String> fileIds;
-    private boolean includeUnprocessed;
+    private Boolean includeUnprocessed;
 
 }

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/PrepareDownloadWithOptionRequest.java

@@ -28,6 +28,6 @@ public class PrepareDownloadWithOptionRequest {
     private List<String> reportTemplateIds = new ArrayList<>();
     private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
     private String redactionPreviewColor;
-    private boolean includeUnprocessed ;
+    private Boolean includeUnprocessed;
 
 }

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/download/DownloadRequest.java

@@ -17,7 +17,7 @@ public class DownloadRequest {
 
     private String userId;
     private String dossierId;
-    private boolean includeUnprocessed;
+    private Boolean includeUnprocessed;
 
     @Builder.Default
     private List<String> fileIds = new ArrayList<>();

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/download/DownloadWithOptionRequest.java

@@ -21,7 +21,7 @@ public class DownloadWithOptionRequest {
 
     private String userId;
     private String dossierId;
-    private boolean includeUnprocessed;
+    private Boolean includeUnprocessed;
 
     @Builder.Default
     private List<String> fileIds = new ArrayList<>();