Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7854 - UI stuck when selecting a future license

Browse Source 
- return 0 values in all invalid cases
This commit is contained in:
Corina Olariu 2023-10-31 15:58:12 +02:00
parent afa75b850c
commit 5c28072103
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();