MAT-7298: add publisher to main library (#225)

* MAT-7298: add publisher to main library * MAT-7298: fix tests * MAT-7298: add null check
MeasureAuthoringTool · Jul 3, 2024 · 562ffa3 · 562ffa3
1 parent c7aa1e2
commit 562ffa3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureBundleService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureBundleService.java
@@ -109,6 +109,9 @@ public List<Bundle.BundleEntryComponent> createBundleComponentsForLibrariesOfMad
       final String accessToken) {
     Library library =
         getMeasureLibraryResourceForMadieMeasure(expressions, madieMeasure, accessToken);
+    if (madieMeasure.getMeasureMetaData().getSteward() != null) {
+      library.setPublisher(madieMeasure.getMeasureMetaData().getSteward().getName());
+    }
     Bundle.BundleEntryComponent mainLibraryBundleComponent =
         FhirResourceHelpers.getBundleEntryComponent(library, "Transaction");
     Map<String, Library> includedLibraryMap = new HashMap<>();

diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java
@@ -74,6 +74,7 @@ public org.hl7.fhir.r4.model.Measure createFhirMeasureForMadieMeasure(Measure ma
             (steward == null || StringUtils.isBlank(steward.getName()))
                 ? UNKNOWN
                 : steward.getName())
+        .setGuidance(madieMeasure.getMeasureMetaData().getGuidance())
         .setCopyright(StringUtils.isBlank(copyright) ? UNKNOWN : copyright)
         .setDisclaimer(StringUtils.isBlank(disclaimer) ? UNKNOWN : disclaimer)
         .setRationale(rationale)
@@ -102,7 +103,6 @@ public org.hl7.fhir.r4.model.Measure createFhirMeasureForMadieMeasure(Measure ma
     for (Extension ext : buildExtensions(madieMeasure)) {
       measure.addExtension(ext);
     }
-
     return measure;
   }
 

diff --git a/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureBundleServiceTest.java b/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureBundleServiceTest.java
@@ -111,12 +111,16 @@ public void testCreateMeasureBundle() {
         (org.hl7.fhir.r4.model.Measure) bundle.getEntry().get(0).getResource();
     assertThat(madieMeasure.getCqlLibraryName(), is(equalTo(measureResource.getName())));
     assertThat(
-        madieMeasure.getMeasureMetaData().getSteward(), is(equalTo(measureResource.getGuidance())));
+        madieMeasure.getMeasureMetaData().getGuidance(),
+        is(equalTo(measureResource.getGuidance())));
 
     Library measureLibrary = (Library) bundle.getEntry().get(1).getResource();
     assertThat(measureLibrary.getName(), is(equalTo(madieMeasure.getCqlLibraryName())));
     assertThat(measureLibrary.getContent(), is(notNullValue()));
     assertThat(measureLibrary.getContent().size(), is(equalTo(2)));
+    assertThat(
+        measureLibrary.getPublisher(),
+        is(equalTo(madieMeasure.getMeasureMetaData().getSteward().getName())));
     Bundle.BundleEntryRequestComponent measureEntryRequest = bundle.getEntry().get(0).getRequest();
     assertThat(
         measureEntryRequest.getUrl(), is(equalTo("Measure/" + madieMeasure.getCqlLibraryName())));
@@ -198,7 +202,8 @@ public void testCreateMeasureBundleForExport() {
         (org.hl7.fhir.r4.model.Measure) bundle.getEntry().get(0).getResource();
     assertThat(madieMeasure.getCqlLibraryName(), is(equalTo(measureResource.getName())));
     assertThat(
-        madieMeasure.getMeasureMetaData().getSteward(), is(equalTo(measureResource.getGuidance())));
+        madieMeasure.getMeasureMetaData().getGuidance(),
+        is(equalTo(measureResource.getGuidance())));
 
     var r4Measure = (org.hl7.fhir.r4.model.Measure) bundle.getEntry().get(0).getResource();
     Library r4MeasureLibrary = (Library) bundle.getEntry().get(1).getResource();
@@ -218,5 +223,8 @@ public void testCreateMeasureBundleForExport() {
     assertThat(
         r4MeasureLibrary.getText().getDivAsString(),
         is(equalTo("<div xmlns=\"http://www.w3.org/1999/xhtml\">test narrative</div>")));
+    assertThat(
+        r4MeasureLibrary.getPublisher(),
+        is(equalTo(madieMeasure.getMeasureMetaData().getSteward().getName())));
   }
 }
diff --git a/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java b/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java
@@ -87,7 +87,7 @@ public void testCreateFhirMeasureForMadieMeasure() {
         measureTranslatorService.createFhirMeasureForMadieMeasure(madieMeasure);
 
     assertThat(measure.getName(), is(equalTo(madieMeasure.getCqlLibraryName())));
-    assertThat(measure.getGuidance(), is(equalTo(madieMeasure.getMeasureMetaData().getSteward())));
+    assertThat(measure.getGuidance(), is(equalTo(madieMeasure.getMeasureMetaData().getGuidance())));
     assertThat(
         measure.getRationale(), is(equalTo(madieMeasure.getMeasureMetaData().getRationale())));
     assertThat(measure.getPublisher(), is(equalTo("UNKNOWN")));
@@ -303,7 +303,7 @@ public void testCreateFhirMeasureForMadieRatioMeasure() {
 
     assertThat(measure.getName(), is(equalTo(madieMeasure.getCqlLibraryName())));
     assertFalse(measure.getExperimental());
-    assertThat(measure.getGuidance(), is(equalTo(madieMeasure.getMeasureMetaData().getSteward())));
+    assertThat(measure.getGuidance(), is(equalTo(madieMeasure.getMeasureMetaData().getGuidance())));
     assertThat(
         measure.getRationale(), is(equalTo(madieMeasure.getMeasureMetaData().getRationale())));
     assertThat(measure.getPublisher(), is(equalTo("testSteward")));

diff --git a/src/test/resources/measures/SimpleFhirMeasureLib/fhir_measure.json b/src/test/resources/measures/SimpleFhirMeasureLib/fhir_measure.json
@@ -11,6 +11,7 @@
   "title": "SimpleFhirMeasure",
   "experimental": true,
   "publisher": "UNKNOWN",
+  "guidance":"test guidance",
   "contact": [
     {
       "telecom": [

diff --git a/src/test/resources/measures/SimpleFhirMeasureLib/madie_measure.json b/src/test/resources/measures/SimpleFhirMeasureLib/madie_measure.json
@@ -247,7 +247,12 @@
    "measurementPeriodEnd": "2023-12-31T08:00:00.000Z",
    "model":"QI-Core v4.1.1",
    "measureMetaData":{
-      "steward":null,
+      "steward":{
+         "id": null,
+         "name": "UNKNOWN",
+         "oid": null,
+         "url": null
+      },
       "description":"test description",
       "copyright":null,
       "disclaimer":null,