Merge pull request #85 from MeasureAuthoringTool/feature/mat-7310-inc…

…lude-drafts-with-latest MAT-7310: Append includeDraft=true to FHIR Term requests when Latest is selected (manifest is null).
MeasureAuthoringTool · Jun 11, 2024 · 7a283e8 · 7a283e8
2 parents 37ff2ce + 07ec3da
commit 7a283e8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/main/java/gov/cms/madie/terminology/util/TerminologyServiceUtil.java b/src/main/java/gov/cms/madie/terminology/util/TerminologyServiceUtil.java
@@ -124,6 +124,8 @@ public static URI buildValueSetResourceUri(
     } else if (manifestExpansion != null
         && StringUtils.isNotBlank(manifestExpansion.getFullUrl())) {
       params.put("manifest", List.of(manifestExpansion.getFullUrl()));
+    } else if (StringUtils.isNotBlank(includeDraft)) {
+      params.put("includeDraft", List.of("true"));
     }
     return UriComponentsBuilder.fromPath(expandValueSetUri).queryParams(params).build().toUri();
   }

diff --git a/src/test/java/gov/cms/madie/terminology/webclient/FhirTerminologyServiceWebClientTest.java b/src/test/java/gov/cms/madie/terminology/webclient/FhirTerminologyServiceWebClientTest.java
@@ -99,6 +99,23 @@ void getLatestValueSetResourceSuccessfully_when_noCustomSearchCriteriaIsProvided
     assertEquals("/ValueSet/test-vs-id/$expand", recordedRequest.getPath());
   }
 
+  @Test
+  void getDraftValueSetResourceSuccessfully_when_noCustomSearchCriteriaIsProvided()
+      throws InterruptedException {
+    mockBackEnd.enqueue(
+        new MockResponse()
+            .setResponseCode(200)
+            .setBody(MOCK_RESPONSE_STRING)
+            .addHeader("Content-Type", "application/fhir+json"));
+    String actualResponse =
+        fhirTerminologyServiceWebClient.getValueSetResource(
+            MOCK_API_KEY, testValueSetParams, null, "yes", new ManifestExpansion());
+    assertNotNull(actualResponse);
+    assertEquals(MOCK_RESPONSE_STRING, actualResponse);
+    RecordedRequest recordedRequest = mockBackEnd.takeRequest();
+    assertEquals("/ValueSet/test-vs-id/$expand?includeDraft=true", recordedRequest.getPath());
+  }
+
   @Test
   void getValueSetResourceSuccessfully_when_manifestExpansionIsProvided()
       throws InterruptedException {