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

Merge branch 'RED-7854-3.6' into 'release/1.363.x'

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

See merge request redactmanager/persistence-service!207
This commit is contained in:
Corina Olariu 2023-11-01 10:15:12 +01:00
commit 4c5dd8d938
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java
View File

@ -37,12 +37,13 @@ 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()
.startDate(licenseReportRequest.getStartDate())
.endDate(licenseReportRequest.getEndDate())
.build();
}
var files = fileStatusService.getStatusesAddedBefore(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID));