Merge pull request #57 from MeasureAuthoringTool/MAT-10112

MAT-10112 generate composite measure bundle on test case list page

Author: adongare

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.cms.madie.packaging</groupId>
 	<artifactId>packaging-utility</artifactId>
-	<version>0.2.15-SNAPSHOT</version>
+	<version>0.2.16-SNAPSHOT</version>
 
 	<name>packaging-utility</name>
 	<description>A simple packaging-utility.</description>

src/main/java/gov/cms/madie/packaging/utils/PackagingUtility.java

@@ -13,6 +13,8 @@ public interface PackagingUtility {
   byte[] buildCompositeExport(
       String compositeBundle, List<Export> componentBundles, String exportFileName);
 
+  String buildCompositeMeasureBundle(String compositeBundle, List<Export> componentExports);
+
   String getHumanReadableWithCSS(Bundle measureBundle);
 
   String getHumanReadableWithCSS(String measureBundleJson);

src/main/java/gov/cms/madie/packaging/utils/qicore411/PackagingUtilityImpl.java

@@ -6,6 +6,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -60,35 +61,63 @@ public byte[] getZipBundle(Object o, String exportFileName) throws InternalServe
   @Override
   public byte[] buildCompositeExport(
       String compositeBundle, List<Export> componentExports, String exportFileName) {
-    Bundle bundle =
-        buildCompositeBundle(
-            compositeBundle,
-            componentExports.stream()
-                .map(Export::getMeasureBundleJson)
-                .collect(Collectors.toList()));
+    Bundle bundle = mergeComponentAndCompositeBundles(compositeBundle, componentExports);
     if (bundle == null) {
       return null;
     }
     return getZipBundle(bundle, exportFileName, null);
   }
 
-  private Bundle buildCompositeBundle(String compositeBundle, List<String> componentBundles) {
+  @Override
+  public String buildCompositeMeasureBundle(String compositeBundle, List<Export> componentExports) {
+    if (StringUtils.isBlank(compositeBundle)) {
+      return null;
+    }
+    if (CollectionUtils.isEmpty(componentExports)) {
+      return compositeBundle;
+    }
+    Bundle bundle = mergeComponentAndCompositeBundles(compositeBundle, componentExports);
+    if (bundle == null) {
+      return null;
+    }
+    return context.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle);
+  }
+
+  /**
+   * Core logic for merging composite and component bundles. Returns the merged Bundle object
+   * directly.
+   */
+  private Bundle mergeComponentAndCompositeBundles(
+      String compositeBundle, List<Export> componentExports) {
     if (StringUtils.isBlank(compositeBundle)) {
       return null;
     }
 
     IParser jsonParser = context.newJsonParser();
     Bundle bundle = (Bundle) jsonParser.parseResource(compositeBundle);
-    if (CollectionUtils.isEmpty(componentBundles)) {
+
+    if (CollectionUtils.isEmpty(componentExports)) {
       return bundle;
     }
+
+    List<String> componentBundleJsons =
+        componentExports.stream()
+            .map(Export::getMeasureBundleJson)
+            .filter(StringUtils::isNotBlank)
+            .toList();
+
+    if (componentBundleJsons.isEmpty()) {
+      return bundle;
+    }
+
     Set<String> existingNameVersions =
         bundle.getEntry().stream()
             .map(this::getNameVersionKey)
-            .filter(java.util.Objects::nonNull)
+            .filter(Objects::nonNull)
             .collect(Collectors.toCollection(HashSet::new));
-    for (String componentBundle : componentBundles) {
-      Bundle component = (Bundle) jsonParser.parseResource(componentBundle);
+
+    for (String componentBundleJson : componentBundleJsons) {
+      Bundle component = (Bundle) jsonParser.parseResource(componentBundleJson);
       for (Bundle.BundleEntryComponent entry : component.getEntry()) {
         String key = getNameVersionKey(entry);
         if (key == null || existingNameVersions.add(key)) {

src/test/java/gov/cms/madie/measure/utilities/qicore411/PackagingUtilityImplTest.java

@@ -190,14 +190,6 @@ void testBuildCompositeExportNullCompositeBundle() {
     assertNull(result);
   }
 
-  @Test
-  void testBuildCompositeExportBlankCompositeBundle() {
-    PackagingUtilityImpl utility = new PackagingUtilityImpl();
-    List<Export> componentExports = new ArrayList<>();
-    byte[] result = utility.buildCompositeExport("", componentExports, "composite");
-    assertNull(result);
-  }
-
   @Test
   void testBuildCompositeExportWithEmptyComponentExports() throws IOException {
     PackagingUtilityImpl utility = new PackagingUtilityImpl();
@@ -225,4 +217,62 @@ void testBuildCompositeExportWithComponentExports() throws IOException {
     assertThat(zipContents.containsKey("composite.json"), is(true));
     assertThat(zipContents.containsKey("composite.xml"), is(true));
   }
+
+  @Test
+  void testBuildCompositeMeasureBundleNullCompositeBundle() {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    String result = utility.buildCompositeMeasureBundle(null, new ArrayList<>());
+    assertNull(result);
+  }
+
+  @Test
+  void testBuildCompositeMeasureBundleWithEmptyComponentExports() {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    String result = utility.buildCompositeMeasureBundle(JsonBits.BUNDLE, new ArrayList<>());
+    // When componentExports is empty, the original compositeBundle string is returned unchanged
+    assertEquals(JsonBits.BUNDLE, result);
+  }
+
+  @Test
+  void testBuildCompositeMeasureBundleWithNullComponentExports() {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    String result = utility.buildCompositeMeasureBundle(JsonBits.BUNDLE, null);
+    // When componentExports is null, the original compositeBundle string is returned unchanged
+    assertEquals(JsonBits.BUNDLE, result);
+  }
+
+  @Test
+  void testBuildCompositeMeasureBundleDeduplicatesEntries() {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    Export componentExport = new Export();
+    componentExport.setMeasureBundleJson(JsonBits.BUNDLE);
+    List<Export> componentExports = List.of(componentExport);
+
+    String result = utility.buildCompositeMeasureBundle(JsonBits.BUNDLE, componentExports);
+    assertNotNull(result);
+    assertThat(result.contains("\"resourceType\": \"Bundle\""), is(true));
+
+    // Parse the result and verify entries were deduplicated (same name|version not duplicated)
+    Bundle resultBundle = FhirContext.forR4().newJsonParser().parseResource(Bundle.class, result);
+    long measureCount =
+        resultBundle.getEntry().stream()
+            .filter(e -> "Measure".equals(e.getResource().getResourceType().name()))
+            .count();
+    // Only one Measure entry since both bundles have same Measure name+version
+    assertEquals(1, measureCount);
+  }
+
+  @Test
+  void testBuildCompositeMeasureBundleFiltersNullAndBlankBundleJson() {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    Export componentWithNull = new Export();
+    componentWithNull.setMeasureBundleJson(null);
+    Export componentWithBlank = new Export();
+    componentWithBlank.setMeasureBundleJson("");
+    List<Export> componentExports = List.of(componentWithNull, componentWithBlank);
+
+    String result = utility.buildCompositeMeasureBundle(JsonBits.BUNDLE, componentExports);
+    assertNotNull(result);
+    assertThat(result.contains("\"resourceType\": \"Bundle\""), is(true));
+  }
 }