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

Merge branch 'RED-7876-backport' into 'release/1.363.x'

Browse Source 
RED-7876 - Diagrams for future license are empty -backport

See merge request redactmanager/persistence-service!210
This commit is contained in:
Corina Olariu 2023-11-13 14:23:02 +01:00
commit 4b0f487d31
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ public class LicenseReportRequest {
public Instant getEndDate() {
if (endDate == null || endDate.isAfter(Instant.now())) {
if (endDate == null) {
endDate = Instant.now();
}
return endDate;

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

@ -38,7 +38,6 @@ public class LicenseReportService {
public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
if (licenseReportRequest.getStartDate() == null ||
licenseReportRequest.getStartDate().isAfter(Instant.now()) ||
licenseReportRequest.getStartDate().isAfter(licenseReportRequest.getEndDate())) {
return LicenseReport.builder()
.startDate(licenseReportRequest.getStartDate())