Merge branch 'RED-9482' into 'release/4.73.x'

RED-9482 - Filter out pending entries from the report

See merge request redactmanager/redaction-report-service!79

redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java

@@ -103,6 +103,10 @@ public class EntityLogConverterService {
                         return;
                     }
 
+                    if (entry.getState() == EntryState.PENDING) {
+                        return;
+                    }
+
                     if (entry.isExcluded()) {
                         return;
                     }

redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java

@@ -527,6 +527,39 @@ public class RedactionReportIntegrationTest {
     }
 
 
+    @Test
+    @SneakyThrows
+    public void testExcelReportWithPendingEntries() {
+
+        Dossier dossier = prepareDossier();
+        EntityLog entityLog = objectMapper.readValue(new ClassPathResource("files/entityLogWithPendingEntries.json").getInputStream(), EntityLog.class);
+        List<EntityLogLegalBasis> legalBasisMapping = objectMapper.readValue(new ClassPathResource("files/legalBasisMapping.json").getInputStream(), new TypeReference<>() {
+        });
+        Map<String, String> mapOfEntityDisplayName = createEntityDisplayNames(entityLog);
+        List<ReportRedactionEntry> reportEntries = entityLogConverterService.convertAndSort(DOSSIER_ID, FILE_ID,entityLog, legalBasisMapping, mapOfEntityDisplayName);
+        var imageResource = new ClassPathResource("files/exampleImage.jpg");
+
+        FileModel fileModel = FileModel.builder().filename("filename").build();
+
+        ClassPathResource templateResource = new ClassPathResource("templates/Excel Report_PlaceholderTest.xlsx");
+
+        var placeholders = buildPlaceHolderModel(Map.of("{{dossier_attribute.test1}}", "replaced_dossier_test1"),
+                                                 Map.of("{{file_attribute.test1}}", "replaced_file_test1", "{{file_attribute.test2}}", "replaced_file_test2"),
+                                                 List.of(new ImagePlaceholder("{{dossier.attribute.Signature}}", IOUtils.toByteArray(imageResource.getInputStream()))));
+
+        XSSFWorkbook readWorkbook = new XSSFWorkbook(templateResource.getInputStream());
+        var excelModel = excelTemplateReportGenerationService.calculateExcelModel(readWorkbook.getSheetAt(0), dossier.getDossierTemplateId());
+        SXSSFWorkbook writeWorkbook = new SXSSFWorkbook();
+        writeWorkbook.createSheet("Sheet1");
+        excelTemplateReportGenerationService.generateExcelReport(reportEntries, placeholders, "test", writeWorkbook, "dossierName", fileModel, excelModel, true);
+
+        byte[] excelTemplateReport3 = excelTemplateReportGenerationService.toByteArray(writeWorkbook);
+        try (FileOutputStream fileOutputStream = new FileOutputStream( getTemporaryDirectory() + "/Report_Without_Pending_Entries.xlsx")) {
+            fileOutputStream.write(excelTemplateReport3);
+        }
+    }
+
+
     @Test
     @SneakyThrows
     public void testScmReport() {