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 97e9fcc60..9077d1311 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 @@ -1,7 +1,6 @@ package com.iqser.red.service.persistence.management.v1.processor.service; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; -import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.license.LicenseReport; import com.iqser.red.service.persistence.service.v1.api.shared.model.license.LicenseReportRequest; @@ -30,11 +29,9 @@ public class LicenseReportService { public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) { - if (licenseReportRequest.getStartDate() == null) { - throw new BadRequestException("Invalid start date."); - } - - if (licenseReportRequest.getStartDate().isAfter(Instant.now())) { + if (licenseReportRequest.getStartDate() == null || + licenseReportRequest.getStartDate().isAfter(Instant.now()) || + licenseReportRequest.getStartDate().isAfter(licenseReportRequest.getEndDate())) { return LicenseReport.builder() .totalFilesUploadedBytes(0) .activeFilesUploadedBytes(0) @@ -51,12 +48,6 @@ public class LicenseReportService { .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();