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

RED-7694 - Backport Fix invalid date period

Browse Source
This commit is contained in:
Andrei Isvoran 2023-10-04 11:37:31 +02:00
parent fe84f2ef04
commit 9e5bd8cfef
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java
View File

@ -36,10 +36,15 @@ public class LicenseReportRequest {
return startDate; return startDate;
} }
public boolean isStartDateBeforeEndDate() {
var endDate = this.endDate == null ? Instant.now() : this.endDate;
return getStartDate().isBefore(endDate);
}
public Instant getEndDate() { public Instant getEndDate() {
if (endDate == null) { if (endDate == null || endDate.isAfter(Instant.now())) {
endDate = Instant.now(); endDate = Instant.now();
} }
return endDate; return endDate;

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

@ -36,7 +36,7 @@ public class LicenseReportService {
public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) { public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
if (licenseReportRequest.getEndDate().isBefore(licenseReportRequest.getStartDate())) { if (!licenseReportRequest.isStartDateBeforeEndDate()) {
throw new BadRequestException("Invalid date period: End date is before start date."); throw new BadRequestException("Invalid date period: End date is before start date.");
} }