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

@@ -35,6 +35,11 @@ public class LicenseReportService {
     public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
 
         var files = fileStatusService.getStatusesAddedBefore(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID));
+
+        if (files == null || files.isEmpty()) {
+            return LicenseReport.builder().startDate(licenseReportRequest.getStartDate()).endDate(licenseReportRequest.getEndDate()).build();
+        }
+
         files.sort(Comparator.comparing(FileModel::getAdded));
 
         var addDossiers = dossierService.getAllDossiers();
@@ -56,7 +61,10 @@ public class LicenseReportService {
             if (file.getHardDeletedTime() != null && file.getHardDeletedTime().toInstant().isBefore(licenseReportRequest.getEndDate())) {
                 hardDeletes.computeIfAbsent(YearMonth.from(file.getHardDeletedTime()), entry -> new ArrayList<>()).add(file);
             }
-            if (dossiersById.get(file.getDossierId()).getArchivedTime() != null && dossiersById.get(file.getDossierId()).getArchivedTime().toInstant().isBefore(licenseReportRequest.getEndDate())) {
+            if (dossiersById.get(file.getDossierId()).getArchivedTime() != null && dossiersById.get(file.getDossierId())
+                    .getArchivedTime()
+                    .toInstant()
+                    .isBefore(licenseReportRequest.getEndDate())) {
                 archives.computeIfAbsent(YearMonth.from(dossiersById.get(file.getDossierId()).getArchivedTime()), entry -> new ArrayList<>()).add(file);
             }
             if (file.getOcrStartTime() != null && file.getOcrStartTime().toInstant().isBefore(licenseReportRequest.getEndDate())) {
@@ -81,13 +89,11 @@ public class LicenseReportService {
         int numberOfAnalyzedFiles = 0;
         int numberOfOcrFiles = 0;
 
-
         while (!currentMonth.isAfter(endMonth)) {
 
             int currentMonthNumberOfAnalyzedPages = 0;
             int currentMonthNumberOfOcrPages = 0;
 
-
             var addedFilesInMonth = adds.get(currentMonth);
             if (addedFilesInMonth != null) {
                 for (var add : addedFilesInMonth) {
@@ -105,10 +111,15 @@ public class LicenseReportService {
             var softDeletedFilesInMonth = softDeletes.get(currentMonth);
             if (softDeletedFilesInMonth != null) {
                 for (var softDeleted : softDeletedFilesInMonth) {
+                    if (dossiersById.get(softDeleted.getDossierId()).getArchivedTime() != null) {
+                        archivedFilesUploadedBytes -= softDeleted.getFileSize();
+                        trashFilesUploadedBytes += softDeleted.getFileSize();
+                    } else {
                         activeFilesUploadedBytes -= softDeleted.getFileSize();
                         trashFilesUploadedBytes += softDeleted.getFileSize();
                     }
                 }
+            }
 
             var archivedFilesInMonth = archives.get(currentMonth);
             if (archivedFilesInMonth != null) {
@@ -180,5 +191,4 @@ public class LicenseReportService {
                 .build();
     }
 
-
 }