From 0d475e283962170f20f9455fe11008178d0e79a2 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 13 Nov 2023 09:50:03 +0200 Subject: [PATCH] RED-7876 - Diagrams for future license are empty - 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 --- .../management/v1/processor/service/LicenseReportService.java | 1 - .../v1/api/shared/model/license/LicenseReportRequest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java index 090f53f48..c7e48b67e 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java @@ -30,7 +30,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()) diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/license/LicenseReportRequest.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/license/LicenseReportRequest.java index 3db05c7a2..cee64a0fc 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/license/LicenseReportRequest.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/license/LicenseReportRequest.java @@ -20,7 +20,7 @@ public class LicenseReportRequest { public Instant getEndDate() { - if (endDate == null || endDate.isAfter(Instant.now())) { + if (endDate == null) { endDate = Instant.now(); } return endDate; -- 2.47.2