Clean up FHIR feature flags (#7046)

* Remove FHIR feature flags

* Clean up fhir-enabled usages

backend/src/main/java/gov/cdc/usds/simplereport/service/ReportTestEventToRSEventListener.java

@@ -3,7 +3,6 @@
 import gov.cdc.usds.simplereport.db.model.TestEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -24,9 +23,6 @@ public class ReportTestEventToRSEventListener {
   @Qualifier("fhirQueueReportingService")
   private final TestEventReportingService fhirQueueReportingService;
 
-  @Value("${simple-report.fhir-reporting-enabled:false}")
-  private boolean fhirReportingEnabled;
-
   @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
   public void handleEvent(ReportTestEventToRSEvent event) {
     reportTestEventToRS(event.testEvent());
@@ -37,8 +33,6 @@ private void reportTestEventToRS(TestEvent savedEvent) {
       testEventReportingService.report(savedEvent);
     }
 
-    if (fhirReportingEnabled) {
-      fhirQueueReportingService.report(savedEvent);
-    }
+    fhirQueueReportingService.report(savedEvent);
   }
 }

backend/src/main/java/gov/cdc/usds/simplereport/service/TestOrderService.java

@@ -48,8 +48,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Hibernate;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -76,15 +74,6 @@ public class TestOrderService {
   private final PatientLinkService _patientLinkService;
   private final ResultService resultService;
 
-  @Qualifier("csvQueueReportingService")
-  private final TestEventReportingService _testEventReportingService;
-
-  @Qualifier("fhirQueueReportingService")
-  private final TestEventReportingService _fhirQueueReportingService;
-
-  @Value("${simple-report.fhir-reporting-enabled:false}")
-  private boolean fhirReportingEnabled;
-
   private final TestResultsDeliveryService testResultsDeliveryService;
   private final DiseaseService _diseaseService;
 

backend/src/main/java/gov/cdc/usds/simplereport/service/TestResultUploadService.java

@@ -101,9 +101,6 @@ public class TestResultUploadService {
   @Value("${simple-report.processing-mode-code:P}")
   private String processingModeCodeValue;
 
-  @Value("${data-hub.fhir-enabled:false}")
-  private boolean fhirEnabled;
-
   private static final int FIVE_MINUTES_MS = 300 * 1000;
   public static final String PROCESSING_MODE_CODE_COLUMN_NAME = "processing_mode_code";
   private static final String ORDER_TEST_DATE_COLUMN_NAME = "order_test_date";
@@ -364,19 +361,16 @@ private CompletableFuture<UniversalSubmissionSummary> submitResultsToUniversalPi
     return CompletableFuture.supplyAsync(
         withMDC(
             () -> {
-              if (fhirEnabled) {
-                long start = System.currentTimeMillis();
-                // convert csv to fhir and serialize to json
-                FHIRBundleRecord fhirBundleWithMeta =
-                    fhirConverter.convertToFhirBundles(content, org.getInternalId());
-                UploadResponse response = uploadBundleAsFhir(fhirBundleWithMeta.serializedBundle());
-                log.info(
-                    "FHIR submitted in " + (System.currentTimeMillis() - start) + " milliseconds");
-
-                return new UniversalSubmissionSummary(
-                    submissionId, org, response, fhirBundleWithMeta.metadata());
-              }
-              return null;
+              long start = System.currentTimeMillis();
+              // convert csv to fhir and serialize to json
+              FHIRBundleRecord fhirBundleWithMeta =
+                  fhirConverter.convertToFhirBundles(content, org.getInternalId());
+              UploadResponse response = uploadBundleAsFhir(fhirBundleWithMeta.serializedBundle());
+              log.info(
+                  "FHIR submitted in " + (System.currentTimeMillis() - start) + " milliseconds");
+
+              return new UniversalSubmissionSummary(
+                  submissionId, org, response, fhirBundleWithMeta.metadata());
             }));
   }
 
@@ -582,7 +576,7 @@ public TestResultUpload processConditionAgnosticResultCSV(InputStream csvStream)
     if (content.length > 0) {
       fhirResponse = submitConditionAgnosticAsFhir(new ByteArrayInputStream(content));
       try {
-        if (fhirResponse != null && fhirResponse.get() != null) {
+        if (fhirResponse.get() != null) {
           fhirResult = mapFhirResponseToUploadResponse(fhirResponse.get(), org, submissionId);
         }
       } catch (CsvProcessingException | ExecutionException | InterruptedException e) {

backend/src/main/resources/application.yaml

@@ -165,7 +165,6 @@ datahub:
   signing-key: ${DATAHUB_SIGNING_KEY:super-secret-signing-key}
   csv-upload-api-client: "simple_report.csvuploader"
   csv-upload-api-fhir-client: "simple_report.fullelr"
-  fhir-enabled: true
 features:
   hivEnabled: true
   singleEntryRsvEnabled: true

backend/src/test/java/gov/cdc/usds/simplereport/integration/UploadConditionAgnosticResultsIntegrationTest.java

@@ -41,14 +41,12 @@
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SliceTestConfiguration.WithSimpleReportStandardUser
 @AutoConfigureWireMock(port = 9561)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestPropertySource(properties = {"data-hub.fhir-enabled=true"})
 class UploadConditionAgnosticResultsIntegrationTest extends BaseAuthenticatedFullStackTest {
   @Autowired private MockMvc mockMvc;
 

backend/src/test/java/gov/cdc/usds/simplereport/integration/UploadTestResultsIntegrationTest.java

@@ -42,14 +42,12 @@
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SliceTestConfiguration.WithSimpleReportStandardUser
 @AutoConfigureWireMock(port = 9561)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestPropertySource(properties = {"data-hub.fhir-enabled=true"})
 class UploadTestResultsIntegrationTest extends BaseAuthenticatedFullStackTest {
   @Autowired private MockMvc mockMvc;
 

backend/src/test/java/gov/cdc/usds/simplereport/service/TestResultUploadServiceTest.java

@@ -426,10 +426,8 @@ void uploadService_processCsv_translatesSpecimenNameToSNOMED() {
   }
 
   @Test
-  void uploadService_FhirEnabled_UploadSentTwice() {
+  void uploadService_UploadSentTwice() {
     // given
-    ReflectionTestUtils.setField(sut, "fhirEnabled", true);
-
     UploadResponse response = buildUploadResponse();
     var tokenResponse = new TokenResponse();
     tokenResponse.setAccessToken("fake-rs-access-token");
@@ -459,10 +457,8 @@ void uploadService_FhirEnabled_UploadSentTwice() {
   }
 
   @Test
-  void uploadService_FhirEnabled_FhirFailure_ReportsCSVResult() {
+  void uploadService_FhirFailure_ReportsCSVResult() {
     // given
-    ReflectionTestUtils.setField(sut, "fhirEnabled", true);
-
     var org = factory.saveValidOrganization();
     var csvReportId = UUID.randomUUID();
     var csvResponse = new UploadResponse();
@@ -517,10 +513,8 @@ void uploadService_FhirEnabled_FhirFailure_ReportsCSVResult() {
   }
 
   @Test
-  void uploadService_FhirEnabled_FhirException_ReportsCSVResult() {
+  void uploadService_FhirException_ReportsCSVResult() {
     // given
-    ReflectionTestUtils.setField(sut, "fhirEnabled", true);
-
     var org = factory.saveValidOrganization();
     var csvReportId = UUID.randomUUID();
     var successfulCsvResponse = new UploadResponse();
@@ -774,8 +768,6 @@ void uploadService_processCsv_filter_out_non_covid_csv() throws IOException {
   @Test
   @SliceTestConfiguration.WithSimpleReportStandardUser
   void uploadService_processCsv_only_submit_fhir_when_flu_only_csv() {
-    ReflectionTestUtils.setField(sut, "fhirEnabled", true);
-
     // GIVEN
     InputStream input = loadCsv("testResultUpload/test-results-upload-valid-flu-only.csv");
     UploadResponse response = buildUploadResponse();

backend/src/test/resources/application-test.yaml

@@ -274,5 +274,4 @@ simple-report-initialization:
 datahub:
   url: http://localhost:9561
   api-key: "super-secret-api-key"
-  jwt-scope: "simple_report.*.report"
-  fhir-enabled: false
+  jwt-scope: "simple_report.*.report"