Merge branch 'develop' into feature/MAT-8023/add-shared-measures-tab

Author: etan-sb

src/main/java/cms/gov/madie/measure/utils/JsonUtil.java

@@ -426,6 +426,7 @@ public static String enforcePatientId(TestCase testCase, String madieJsonResourc
   // update full urls for non-patient resources
   public static String updateResourceFullUrls(TestCase testCase, String madieJsonResourcesBaseUri) {
     ObjectMapper mapper = new ObjectMapper();
+    boolean jsonValid = false;
     try {
       JsonNode rootNode = mapper.readTree(testCase.getJson());
       JsonNode entry = rootNode.get("entry");
@@ -441,11 +442,16 @@ public static String updateResourceFullUrls(TestCase testCase, String madieJsonR
               String newUrl = buildFullUrl(id, resourceType, madieJsonResourcesBaseUri);
               ObjectNode node = (ObjectNode) theNode;
               node.put("fullUrl", newUrl);
+              jsonValid = true;
             }
           }
         }
       }
-      return jsonNodeToString(mapper, rootNode);
+      if (!jsonValid) {
+        return testCase.getJson();
+      } else {
+        return jsonNodeToString(mapper, rootNode);
+      }
     } catch (JsonProcessingException ex) {
       log.error("Error reading testCaseJson testCaseId = " + testCase.getId(), ex);
     }

src/test/java/cms/gov/madie/measure/utils/JsonUtilTest.java

@@ -561,6 +561,23 @@ void updateResourceFullUrlsIfNoTestResourceAvailable() {
     assertFalse(updatedTc1.contains(baseUrl));
   }
 
+  @Test
+  void updateResourceFullUrlsIfJsonInvalid() {
+    final String json = getData("/bundles/qicore_json_util_fullurl.json");
+    // remove the opening { to make json invalid
+    String invalidJson = json.substring(1, json.length());
+    TestCase tc1 =
+        TestCase.builder()
+            .id("TC1")
+            .name("TC1")
+            .patientId(UUID.randomUUID())
+            .json(invalidJson)
+            .build();
+    String updatedTc1 = JsonUtil.updateResourceFullUrls(tc1, baseUrl);
+    // original json is returned when json is invalid
+    assertEquals(updatedTc1, invalidJson);
+  }
+
   @Test
   void updateResourceFullUrlsIfEntryNodeNotAvailable() {
     final String json =