remove HAPI from props, and from FHIR client; remove attempt to persi…

…st measure bundle to HAPI
MeasureAuthoringTool · Sep 19, 2023 · d2846f0 · d2846f0
1 parent 2e66368
commit d2846f0
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 126 deletions.
diff --git a/src/main/java/cms/gov/madie/measure/HapiFhirConfig.java b/src/main/java/cms/gov/madie/measure/HapiFhirConfig.java
diff --git a/src/main/java/cms/gov/madie/measure/services/FhirServicesClient.java b/src/main/java/cms/gov/madie/measure/services/FhirServicesClient.java
@@ -70,23 +70,6 @@ public ResponseEntity<HapiOperationOutcome> validateBundle(
         uri, HttpMethod.POST, measureEntity, HapiOperationOutcome.class);
   }
 
-  public ResponseEntity<String> saveMeasureInHapiFhir(Measure measure, String accessToken) {
-    URI uri =
-        URI.create(
-            fhirServicesConfig.getMadieFhirServiceBaseUrl()
-                + fhirServicesConfig.getMadieFhirServiceSaveMeasureUri());
-    HttpHeaders headers = new HttpHeaders();
-    headers.set(HttpHeaders.AUTHORIZATION, accessToken);
-    HttpEntity<Measure> measureEntity = new HttpEntity<>(measure, headers);
-    try {
-      return fhirServicesRestTemplate.exchange(uri, HttpMethod.POST, measureEntity, String.class);
-    } catch (RestClientResponseException e) {
-      // Ignore errors when saving Measures to HAPI as they're never retrieved.
-      return new ResponseEntity<>(
-          e.getResponseBodyAsString(), HttpStatus.valueOf(e.getRawStatusCode()));
-    }
-  }
-
   public ResponseEntity<byte[]> getTestCaseExports(
       Measure measure, String accessToken, List<String> testCaseId) {
     URI uri =

diff --git a/src/main/java/cms/gov/madie/measure/services/VersionService.java b/src/main/java/cms/gov/madie/measure/services/VersionService.java
@@ -314,18 +314,5 @@ private void saveMeasureBundle(
         "User [{}] successfully saved versioned measure's export data with ID [{}]",
         username,
         savedExport.getId());
-    ResponseEntity<String> result =
-        fhirServicesClient.saveMeasureInHapiFhir(savedMeasure, accessToken);
-    if (result.getStatusCode() == HttpStatus.OK) {
-      log.info(
-          "User [{}] successfully saved versioned measure with ID [{}] in HAPI FHIR",
-          username,
-          result.getBody());
-    } else {
-      log.info(
-          "User [{}] failed to save versioned measure in HAPI FHIR: {}",
-          username,
-          result.getBody());
-    }
   }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -61,11 +61,4 @@ admin-api-key: ${ADMIN_API_KEY:0a51991c}
 
 mongock:
   migration-scan-package:
-    - cms.gov.madie.measure.config
-
-hapi-fhir:
-  url: ${HAPI_FHIR_URL:http://localhost:8087/fhir}
-  patient:
-    uri: /Patient
-  bundle:
-    uri: /Bundle
+    - cms.gov.madie.measure.config
diff --git a/src/test/java/cms/gov/madie/measure/services/FhirServicesClientTest.java b/src/test/java/cms/gov/madie/measure/services/FhirServicesClientTest.java
@@ -156,57 +156,6 @@ void testValidateBundleReturnsStringData() throws JsonProcessingException {
     assertThat(authorization.get(0), is(equalTo(accessToken)));
   }
 
-  @Test
-  void testSaveMeasureInHapiFhirsStringData() {
-    final String goodOutcomeJson = "{ \"code\": 200, \"successful\": true }";
-    Measure measure =
-        Measure.builder()
-            .id("testMeasureId")
-            .measureSetId("testMeasureSetId")
-            .createdBy("testUser")
-            .cql("library Test1CQLLib version '2.3.001'")
-            .build();
-
-    when(fhirServicesConfig
-            .fhirServicesRestTemplate()
-            .exchange(any(URI.class), eq(HttpMethod.POST), any(HttpEntity.class), any(Class.class)))
-        .thenReturn(ResponseEntity.ok(goodOutcomeJson));
-    ResponseEntity<String> output = fhirServicesClient.saveMeasureInHapiFhir(measure, accessToken);
-    assertThat(output, is(notNullValue()));
-    assertThat(output.getBody(), is(notNullValue()));
-    assertThat(output.getBody(), is(equalTo(goodOutcomeJson)));
-    verify(fhirServicesConfig.fhirServicesRestTemplate(), times(1))
-        .exchange(
-            any(URI.class), eq(HttpMethod.POST), httpEntityCaptor.capture(), any(Class.class));
-    HttpEntity httpEntity = httpEntityCaptor.getValue();
-    assertThat(httpEntity.getHeaders(), is(notNullValue()));
-    List<String> authorization = httpEntity.getHeaders().get(HttpHeaders.AUTHORIZATION);
-    assertThat(authorization, is(notNullValue()));
-    assertThat(authorization.size(), is(equalTo(1)));
-    assertThat(authorization.get(0), is(equalTo(accessToken)));
-  }
-
-  @Test
-  void testSaveMeasureInHapiFhirsExceptionIgnored() {
-    Measure measure =
-        Measure.builder()
-            .id("testMeasureId")
-            .measureSetId("testMeasureSetId")
-            .createdBy("testUser")
-            .cql("library Test1CQLLib version '2.3.001'")
-            .build();
-
-    when(fhirServicesConfig
-            .fhirServicesRestTemplate()
-            .exchange(any(URI.class), eq(HttpMethod.POST), any(HttpEntity.class), any(Class.class)))
-        .thenThrow(
-            new RestClientResponseException(
-                "failure", 500, "Server Error", null, "error".getBytes(), null));
-    ResponseEntity<String> output = fhirServicesClient.saveMeasureInHapiFhir(measure, accessToken);
-    assertThat(output.getStatusCode(), not(HttpStatus.OK));
-    assertNotNull(output.getBody());
-  }
-
   @Test
   void testGetTestCaseExports() {
     Measure measure =

diff --git a/src/test/java/cms/gov/madie/measure/services/TestCaseServiceTest.java b/src/test/java/cms/gov/madie/measure/services/TestCaseServiceTest.java
@@ -1,6 +1,5 @@
 package cms.gov.madie.measure.services;
 
-import cms.gov.madie.measure.HapiFhirConfig;
 import cms.gov.madie.measure.dto.JobStatus;
 import cms.gov.madie.measure.dto.MeasureTestCaseValidationReport;
 import cms.gov.madie.measure.exceptions.DuplicateTestCaseNameException;
@@ -90,8 +89,6 @@
 @ExtendWith(MockitoExtension.class)
 public class TestCaseServiceTest implements ResourceUtil {
   @Mock private MeasureRepository measureRepository;
-  @Mock private HapiFhirConfig hapiFhirConfig;
-  @Mock private RestTemplate hapiFhirRestTemplate;
   @Mock private ActionLogService actionLogService;
   @Mock private TestCaseServiceUtil testCaseServiceUtil;
 

diff --git a/src/test/java/cms/gov/madie/measure/services/VersionServiceTest.java b/src/test/java/cms/gov/madie/measure/services/VersionServiceTest.java
@@ -416,9 +416,6 @@ public void testCreateVersionMajorSuccess() throws Exception {
     updatedMeasure.setMeasureMetaData(updatedMetaData);
     when(measureRepository.save(any(Measure.class))).thenReturn(updatedMeasure);
 
-    when(fhirServicesClient.saveMeasureInHapiFhir(any(), anyString()))
-        .thenReturn(ResponseEntity.ok("Created"));
-
     Export measureExport =
         Export.builder()
             .id("testId")
@@ -456,8 +453,6 @@ public void testCreateVersionMajorSuccess() throws Exception {
     Export capturedExport = exportArgumentCaptor.getValue();
     assertEquals(savedValue.getId(), capturedExport.getMeasureId());
     assertEquals(measureExport.getMeasureBundleJson(), capturedExport.getMeasureBundleJson());
-
-    verify(fhirServicesClient, times(1)).saveMeasureInHapiFhir(updatedMeasure, "accesstoken");
   }
 
   @Test
@@ -553,9 +548,6 @@ public void testCreateFhirVersionPatchSuccess() throws Exception {
     updatedMeasure.setMeasureMetaData(updatedMetaData);
     when(measureRepository.save(any(Measure.class))).thenReturn(updatedMeasure);
 
-    when(fhirServicesClient.saveMeasureInHapiFhir(any(), anyString()))
-        .thenReturn(new ResponseEntity<>(HttpStatus.OK));
-
     Export measureExport =
         Export.builder()
             .id("testId")
@@ -593,8 +585,6 @@ public void testCreateFhirVersionPatchSuccess() throws Exception {
     Export savedExport = exportArgumentCaptor.getValue();
     assertEquals(savedValue.getId(), savedExport.getMeasureId());
     assertEquals(measureExport.getMeasureBundleJson(), savedExport.getMeasureBundleJson());
-
-    verify(fhirServicesClient, times(1)).saveMeasureInHapiFhir(updatedMeasure, "accesstoken");
   }
 
   @Test