From afa75b850c9631958dabf2ecdc98de6712a850c7 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 31 Oct 2023 15:39:06 +0200 Subject: [PATCH] RED-7854 - UI stuck when selecting a future license - in case start date is in the future send 0 values for license report --- .../service/LicenseReportService.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java index da445db13..97e9fcc60 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java @@ -30,14 +30,33 @@ public class LicenseReportService { public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) { - if (licenseReportRequest.getStartDate() == null || licenseReportRequest.getStartDate().isAfter(Instant.now())) { + if (licenseReportRequest.getStartDate() == null) { throw new BadRequestException("Invalid start date."); } + if (licenseReportRequest.getStartDate().isAfter(Instant.now())) { + return LicenseReport.builder() + .totalFilesUploadedBytes(0) + .activeFilesUploadedBytes(0) + .trashFilesUploadedBytes(0) + .archivedFilesUploadedBytes(0) + .numberOfAnalyzedPages(0) + .numberOfOcrPages(0) + .numberOfAnalyzedFiles(0) + .analysedFilesBytes(0) + .numberOfOcrFiles(0) + .numberOfDossiers(0) + .startDate(licenseReportRequest.getStartDate()) + .endDate(licenseReportRequest.getEndDate()) + .build(); + } + if (licenseReportRequest.getStartDate().isAfter(licenseReportRequest.getEndDate())) { throw new BadRequestException("Invalid date period: End date is before start date."); } + + var files = fileStatusService.getStatusesAddedBefore(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID)); var addDossiers = dossierService.getAllDossiers();