Add covid only flag for resend mutation (#7790)

* Add covid only flag for resend mutation * Update conditionals * Make booleans conditional for resend mutation * Update graphql codegen
CDCgov · Jun 11, 2024 · 2e7e3b4 · 2e7e3b4
1 parent 496bd29
commit 2e7e3b4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/...nd/src/main/java/gov/cdc/usds/simplereport/api/testresult/TestResultMutationResolver.java b/...nd/src/main/java/gov/cdc/usds/simplereport/api/testresult/TestResultMutationResolver.java
@@ -27,15 +27,19 @@ public class TestResultMutationResolver {
   @MutationMapping
   @AuthorizationConfiguration.RequireGlobalAdminUser
   public boolean resendToReportStream(
-      @Argument List<UUID> testEventIds, @Argument boolean fhirOnly) {
+      @Argument List<UUID> testEventIds, @Argument boolean fhirOnly, @Argument boolean covidOnly) {
     testEventRepository
         .findAllByInternalIdIn(testEventIds)
         .forEach(
             testEvent -> {
-              if (!fhirOnly) {
+              if (fhirOnly) {
+                fhirReportingService.report(testEvent);
+              } else if (covidOnly) {
                 testEventReportingService.report(testEvent);
+              } else {
+                testEventReportingService.report(testEvent);
+                fhirReportingService.report(testEvent);
               }
-              fhirReportingService.report(testEvent);
             });
 
     return true;

diff --git a/backend/src/main/resources/graphql/admin.graphqls b/backend/src/main/resources/graphql/admin.graphqls
@@ -10,7 +10,7 @@ extend type Query {
   getOrgAdminUserIds(orgId: ID!): [ID]
 }
 extend type Mutation {
-  resendToReportStream(testEventIds: [ID!]!, fhirOnly: Boolean!): Boolean
+  resendToReportStream(testEventIds: [ID!]!, fhirOnly: Boolean = false, covidOnly: Boolean = false): Boolean
   createDeviceType(input: CreateDeviceType!): DeviceType
   updateDeviceType(input: UpdateDeviceType!): DeviceType
   createSpecimenType(input: CreateSpecimenType!): SpecimenType

diff --git a/...rc/test/java/gov/cdc/usds/simplereport/api/testresult/TestResultMutationResolverTest.java b/...rc/test/java/gov/cdc/usds/simplereport/api/testresult/TestResultMutationResolverTest.java
@@ -30,7 +30,7 @@ void resendToReportStream_success() {
 
     var actual =
         testResultMutationResolver.resendToReportStream(
-            List.of(UUID.randomUUID(), UUID.randomUUID()), false);
+            List.of(UUID.randomUUID(), UUID.randomUUID()), false, false);
 
     verify(mockCsvReporter, times(2)).report(any());
     verify(mockFhirReporter, times(2)).report(any());
@@ -50,10 +50,30 @@ void resendToReportStream_fhirOnly_success() {
 
     var actual =
         testResultMutationResolver.resendToReportStream(
-            List.of(UUID.randomUUID(), UUID.randomUUID()), true);
+            List.of(UUID.randomUUID(), UUID.randomUUID()), true, false);
 
     verify(mockCsvReporter, times(0)).report(any());
     verify(mockFhirReporter, times(2)).report(any());
     assertThat(actual).isTrue();
   }
+
+  @Test
+  void resendToReportStream_covidOnly_success() {
+    var mockCsvReporter = mock(TestEventReportingService.class);
+    var mockFhirReporter = mock(TestEventReportingService.class);
+    var mockTestEventRepository = mock(TestEventRepository.class);
+
+    when(mockTestEventRepository.findAllByInternalIdIn(any()))
+        .thenReturn(List.of(createCovidTestEvent(), createMultiplexTestEvent()));
+    var testResultMutationResolver =
+        new TestResultMutationResolver(mockTestEventRepository, mockCsvReporter, mockFhirReporter);
+
+    var actual =
+        testResultMutationResolver.resendToReportStream(
+            List.of(UUID.randomUUID(), UUID.randomUUID()), false, true);
+
+    verify(mockCsvReporter, times(2)).report(any());
+    verify(mockFhirReporter, times(0)).report(any());
+    assertThat(actual).isTrue();
+  }
 }
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
@@ -398,7 +398,8 @@ export type MutationResendActivationEmailArgs = {
 };
 
 export type MutationResendToReportStreamArgs = {
-  fhirOnly: Scalars["Boolean"]["input"];
+  covidOnly?: InputMaybe<Scalars["Boolean"]["input"]>;
+  fhirOnly?: InputMaybe<Scalars["Boolean"]["input"]>;
   testEventIds: Array<Scalars["ID"]["input"]>;
 };