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

Merge branch 'RED-7854' into 'master'

Browse Source 
RED-7854 - UI stuck when selecting a future license

Closes RED-7854

See merge request redactmanager/persistence-service!204
This commit is contained in:
Corina Olariu 2023-10-31 15:42:50 +01:00
commit f60ef37a08
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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,12 +29,23 @@ public class LicenseReportService {
public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
if (licenseReportRequest.getStartDate() == null || licenseReportRequest.getStartDate().isAfter(Instant.now())) {
throw new BadRequestException("Invalid start date.");
}
if (licenseReportRequest.getStartDate().isAfter(licenseReportRequest.getEndDate())) {
throw new BadRequestException("Invalid date period: End date is before start date.");
if (licenseReportRequest.getStartDate() == null ||
licenseReportRequest.getStartDate().isAfter(Instant.now()) ||
licenseReportRequest.getStartDate().isAfter(licenseReportRequest.getEndDate())) {
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();
}
var files = fileStatusService.getStatusesAddedBefore(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID));