Merge pull request #56 from MeasureAuthoringTool/MAT-10054

MAT-10054 composite measure export

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.14-SNAPSHOT</version>
+	<version>0.2.15-SNAPSHOT</version>
 
 	<name>packaging-utility</name>
 	<description>A simple packaging-utility.</description>

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

@@ -1,12 +1,18 @@
 package gov.cms.madie.packaging.utils;
 
+import gov.cms.madie.models.measure.Export;
 import gov.cms.madie.packaging.exceptions.InternalServerException;
 import org.hl7.fhir.r4.model.Bundle;
 
+import java.util.List;
+
 public interface PackagingUtility {
 
   byte[] getZipBundle(Object export, String exportFileName) throws InternalServerException;
 
+  byte[] buildCompositeExport(
+      String compositeBundle, List<Export> componentBundles, String exportFileName);
+
   String getHumanReadableWithCSS(Bundle measureBundle);
 
   String getHumanReadableWithCSS(String measureBundleJson);

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

@@ -3,8 +3,10 @@
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -20,6 +22,7 @@
 import gov.cms.madie.packaging.utils.ZipUtility;
 import gov.cms.madie.packaging.utils.qicore.ResourceUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 
 @Slf4j
 public class PackagingUtilityImpl implements PackagingUtility {
@@ -54,6 +57,48 @@ public byte[] getZipBundle(Object o, String exportFileName) throws InternalServe
           "Calling gicore411.PackagingUtilityImpl with invalid object");
   }
 
+  @Override
+  public byte[] buildCompositeExport(
+      String compositeBundle, List<Export> componentExports, String exportFileName) {
+    Bundle bundle =
+        buildCompositeBundle(
+            compositeBundle,
+            componentExports.stream()
+                .map(Export::getMeasureBundleJson)
+                .collect(Collectors.toList()));
+    if (bundle == null) {
+      return null;
+    }
+    return getZipBundle(bundle, exportFileName, null);
+  }
+
+  private Bundle buildCompositeBundle(String compositeBundle, List<String> componentBundles) {
+    if (StringUtils.isBlank(compositeBundle)) {
+      return null;
+    }
+
+    IParser jsonParser = context.newJsonParser();
+    Bundle bundle = (Bundle) jsonParser.parseResource(compositeBundle);
+    if (CollectionUtils.isEmpty(componentBundles)) {
+      return bundle;
+    }
+    Set<String> existingNameVersions =
+        bundle.getEntry().stream()
+            .map(this::getNameVersionKey)
+            .filter(java.util.Objects::nonNull)
+            .collect(Collectors.toCollection(HashSet::new));
+    for (String componentBundle : componentBundles) {
+      Bundle component = (Bundle) jsonParser.parseResource(componentBundle);
+      for (Bundle.BundleEntryComponent entry : component.getEntry()) {
+        String key = getNameVersionKey(entry);
+        if (key == null || existingNameVersions.add(key)) {
+          bundle.addEntry(entry);
+        }
+      }
+    }
+    return bundle;
+  }
+
   private byte[] getZipBundle(Bundle bundle, String exportFileName, String humanReadable)
       throws InternalServerException {
 
@@ -241,4 +286,16 @@ private List<Measure> getMeasureResource(Bundle measureBundle) {
         .map(entry -> (Measure) entry.getResource())
         .toList();
   }
+
+  private String getNameVersionKey(Bundle.BundleEntryComponent entry) {
+    if (entry.getResource() instanceof MetadataResource metadataResource) {
+      String type = metadataResource.getResourceType().name();
+      String name = metadataResource.getName();
+      String version = metadataResource.getVersion();
+      if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(version)) {
+        return type + "|" + name + "|" + version;
+      }
+    }
+    return null;
+  }
 }

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

@@ -1,9 +1,6 @@
 package gov.cms.madie.measure.utilities.qicore411;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import gov.cms.madie.packaging.utils.ResourceFileUtil;
 import org.apache.commons.io.FilenameUtils;
@@ -18,12 +15,15 @@
 import gov.cms.madie.packaging.utils.qicore411.PackagingUtilityImpl;
 
 import java.io.*;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.*;
 
 class PackagingUtilityImplTest implements ResourceFileUtil {
 
@@ -181,4 +181,48 @@ void testGetZipBundleForMultipleTestCases() throws IOException {
     assertThat(zipContents.containsKey("TC1.json"), is(true));
     assertThat(zipContents.containsKey("TC2.json"), is(true));
   }
+
+  @Test
+  void testBuildCompositeExportNullCompositeBundle() {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    List<Export> componentExports = new ArrayList<>();
+    byte[] result = utility.buildCompositeExport(null, componentExports, "composite");
+    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();
+    List<Export> componentExports = new ArrayList<>();
+    byte[] result = utility.buildCompositeExport(JsonBits.BUNDLE, componentExports, "composite");
+    assertNotNull(result);
+
+    Map<String, String> zipContents = getZipContents(result);
+    assertThat(zipContents.containsKey("composite.json"), is(true));
+    assertThat(zipContents.containsKey("composite.xml"), is(true));
+    assertThat(zipContents.containsKey("composite.html"), is(true));
+  }
+
+  @Test
+  void testBuildCompositeExportWithComponentExports() throws IOException {
+    PackagingUtilityImpl utility = new PackagingUtilityImpl();
+    Export componentExport = new Export();
+    componentExport.setMeasureBundleJson(JsonBits.BUNDLE);
+    List<Export> componentExports = List.of(componentExport);
+
+    byte[] result = utility.buildCompositeExport(JsonBits.BUNDLE, componentExports, "composite");
+    assertNotNull(result);
+
+    Map<String, String> zipContents = getZipContents(result);
+    assertThat(zipContents.containsKey("composite.json"), is(true));
+    assertThat(zipContents.containsKey("composite.xml"), is(true));
+  }
 }