Merge branch 'develop' into snyk-fix-b63f3e3b39a97955ce7b8bedc26146df

MeasureAuthoringTool · Sep 21, 2023 · a4eb191 · a4eb191
2 parents a81ff39 + 9c8b694
commit a4eb191
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 393 deletions.
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/hapi/HapiFhirServer.java b/src/main/java/gov/cms/madie/madiefhirservice/hapi/HapiFhirServer.java
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/resources/MeasureBundleController.java b/src/main/java/gov/cms/madie/madiefhirservice/resources/MeasureBundleController.java
@@ -65,39 +65,6 @@ public ResponseEntity<String> getMeasureBundle(
         .body(fhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle));
   }
 
-  @PostMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE)
-  public ResponseEntity<String> saveMeasure(
-      HttpServletRequest request,
-      @RequestHeader("Authorization") String accessToken,
-      @RequestBody @Validated(Measure.ValidationSequence.class) Measure measure) {
-    log.debug("Entering saveMeasure()");
-
-    Bundle bundle =
-        measureBundleService.createMeasureBundle(
-            measure,
-            request.getUserPrincipal(),
-            BundleUtil.MEASURE_BUNDLE_TYPE_EXPORT,
-            accessToken);
-    bundle.setType(Bundle.BundleType.DOCUMENT);
-    String serialized =
-        fhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle);
-    MethodOutcome outcome = measureBundleService.saveMeasureBundle(serialized);
-
-    if (outcome != null && outcome.getCreated()) {
-      log.debug(
-          "Successfully saved MADiE measure in HAPI FHIR. MADiE measure id = "
-              + measure.getId()
-              + " HAPI FHIR id = "
-              + outcome.getId().toString());
-      return ResponseEntity.status(HttpStatus.CREATED).body(outcome.getId().toString());
-    } else {
-      String errorMsg =
-          "Error saving versioned measure in HAPI FHIR! MADiE measure id = " + measure.getId();
-      log.error(errorMsg);
-      return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorMsg);
-    }
-  }
-
   @PutMapping(
       value = "/export",
       produces = {

diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/HumanReadableService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/HumanReadableService.java
@@ -35,7 +35,6 @@
 @Service
 @RequiredArgsConstructor
 public class HumanReadableService extends ResourceUtils {
-
 
   private final LiquidEngine liquidEngine;
 

diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureBundleService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureBundleService.java
@@ -1,7 +1,6 @@
 package gov.cms.madie.madiefhirservice.services;
 
 import gov.cms.madie.madiefhirservice.constants.UriConstants;
-import gov.cms.madie.madiefhirservice.hapi.HapiFhirServer;
 import gov.cms.madie.madiefhirservice.utils.BundleUtil;
 import gov.cms.madie.madiefhirservice.utils.FhirResourceHelpers;
 import gov.cms.madie.madiefhirservice.utils.ResourceUtils;
@@ -23,8 +22,6 @@
 import org.hl7.fhir.r4.model.Resource;
 import org.springframework.stereotype.Service;
 
-import ca.uhn.fhir.rest.api.MethodOutcome;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +34,6 @@ public class MeasureBundleService {
   private final MeasureTranslatorService measureTranslatorService;
   private final LibraryTranslatorService libraryTranslatorService;
   private final LibraryService libraryService;
-  private final HapiFhirServer hapiFhirServer;
   private final ElmTranslatorClient elmTranslatorClient;
   private final HumanReadableService humanReadableService;
 
@@ -149,10 +145,6 @@ public CqlLibrary createCqlLibraryForMadieMeasure(Measure madieMeasure) {
         .build();
   }
 
-  public MethodOutcome saveMeasureBundle(String measureBundle) {
-    return hapiFhirServer.createResourceAsString(measureBundle);
-  }
-
   private void setNarrativeText(DomainResource resource, String humanReadable) {
     Narrative narrative = new Narrative();
     narrative.setStatus(Narrative.NarrativeStatus.EXTENSIONS);

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -3,10 +3,6 @@ server:
   servlet:
     context-path: /api
 
-hapi:
-  fhir:
-    url: ${HAPI_FHIR_URL:http://localhost:8080/fhir}
-
 fhir-base-url: ${FHIR_BASE_URL:http://ecqi.healthit.gov/ecqms}
 
 madie:

diff --git a/src/test/java/gov/cms/madie/madiefhirservice/hapi/HapiFhirServerTest.java b/src/test/java/gov/cms/madie/madiefhirservice/hapi/HapiFhirServerTest.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ @@
     @Service
     @RequiredArgsConstructor
     public class HumanReadableService extends ResourceUtils {
       private final LiquidEngine liquidEngine;
@@ Expand Down @@