From 8a0dcfd6209c632d470a16678d1206c5a7e9aa7c Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 13 Nov 2023 15:12:48 +0200 Subject: [PATCH] RED-7876 - Diagrams for future license are empty -backport - remove the check for start date in the future - remove the setting to set current date for end date in case date is in the future --- .../service/v1/api/model/license/LicenseReportRequest.java | 2 +- .../peristence/v1/server/service/LicenseReportService.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java index 3fd1b7c8b..a81e746b2 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java @@ -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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java index c31ec8173..6b7321432 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java @@ -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()) -- 2.47.2