Merge pull request #188 from MeasureAuthoringTool/MAT-6403_removeDefa…

…ultApprovalDateLastReviewDate MAT-6403 remove default approval date and last review date
MeasureAuthoringTool · Dec 20, 2023 · cdf1898 · cdf1898
2 parents cd0993f + 8a0501b
commit cdf1898
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java
@@ -66,8 +66,8 @@ public org.hl7.fhir.r4.model.Measure createFhirMeasureForMadieMeasure(Measure ma
         .setEffectivePeriod(
             getPeriodFromDates(
                 madieMeasure.getMeasurementPeriodStart(), madieMeasure.getMeasurementPeriodEnd()))
-        .setApprovalDate(Date.from(Optional.ofNullable(approvalDate).orElse(Instant.now())))
-        .setLastReviewDate(Date.from(Optional.ofNullable(lastReviewDate).orElse(Instant.now())))
+        .setApprovalDate(approvalDate != null ? Date.from(approvalDate) : null)
+        .setLastReviewDate(lastReviewDate != null ? Date.from(lastReviewDate) : null)
         .setPublisher(
             (steward == null || StringUtils.isBlank(steward.getName()))
                 ? UNKNOWN

diff --git a/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java b/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java
@@ -450,12 +450,8 @@ public void testCreateFhirMeasureForMadieCVMeasure() {
     assertThat(
         DateFormatUtils.format(measure.getEffectivePeriod().getEnd(), "MM/dd/yyyy"),
         is(equalTo("01/01/2023")));
-    assertThat(
-        DateFormatUtils.format(measure.getApprovalDate(), "MM/dd/yyyy"),
-        is(equalTo(DateFormatUtils.format(java.util.Date.from(Instant.now()), "MM/dd/yyyy"))));
-    assertThat(
-        DateFormatUtils.format(measure.getLastReviewDate(), "MM/dd/yyyy"),
-        is(equalTo(DateFormatUtils.format(java.util.Date.from(Instant.now()), "MM/dd/yyyy"))));
+    assertNull(measure.getApprovalDate());
+    assertNull(measure.getLastReviewDate());
     assertThat(measure.getMeta().getProfile().size(), is(equalTo(3)));
     assertThat(
         measure.getMeta().hasProfile(UriConstants.CqfMeasures.EXECUTABLE_MEASURE_PROFILE_URI),