Use CleanBaseMutation

greenriver · Feb 6, 2025 · e6661b2 · e6661b2
1 parent 128e6b3
commit e6661b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 34 deletions.
diff --git a/drivers/hmis/app/graphql/mutations/join_household.rb b/drivers/hmis/app/graphql/mutations/join_household.rb
@@ -5,7 +5,7 @@
 ###
 
 module Mutations
-  class JoinHousehold < BaseMutation
+  class JoinHousehold < CleanBaseMutation
     argument :receiving_household_id, ID, required: true
     argument :joining_enrollment_inputs, [Types::HmisSchema::EnrollmentRelationshipInput], required: true
 

diff --git a/drivers/hmis/app/graphql/schema.graphql b/drivers/hmis/app/graphql/schema.graphql
@@ -5633,26 +5633,10 @@ Represents untyped JSON
 """
 scalar JSON
 
-"""
-Autogenerated input type of JoinHousehold
-"""
-input JoinHouseholdInput {
-  """
-  A unique identifier for the client performing the mutation.
-  """
-  clientMutationId: String
-  joiningEnrollmentInputs: [EnrollmentRelationshipInput!]!
-  receivingHouseholdId: ID!
-}
-
 """
 Autogenerated return type of JoinHousehold.
 """
 type JoinHouseholdPayload {
-  """
-  A unique identifier for the client performing the mutation.
-  """
-  clientMutationId: String
   donorHousehold: Household
   errors: [ValidationError!]!
   receivingHousehold: Household!
@@ -6248,12 +6232,7 @@ type Mutation {
     """
     input: DeleteUnitsInput!
   ): DeleteUnitsPayload
-  joinHousehold(
-    """
-    Parameters for JoinHousehold
-    """
-    input: JoinHouseholdInput!
-  ): JoinHouseholdPayload
+  joinHousehold(joiningEnrollmentInputs: [EnrollmentRelationshipInput!]!, receivingHouseholdId: ID!): JoinHouseholdPayload
   mergeClients(
     """
     Parameters for MergeClients

diff --git a/drivers/hmis/spec/requests/hmis/join_household_spec.rb b/drivers/hmis/spec/requests/hmis/join_household_spec.rb
@@ -22,8 +22,8 @@
 
   let(:mutation) do
     <<~GRAPHQL
-      mutation JoinHousehold($input: JoinHouseholdInput!) {
-        joinHousehold(input: $input) {
+      mutation JoinHousehold($receivingHouseholdId: ID!, $joiningEnrollmentInputs: [EnrollmentRelationshipInput!]!) {
+        joinHousehold(receivingHouseholdId:$receivingHouseholdId, joiningEnrollmentInputs:$joiningEnrollmentInputs) {
           receivingHousehold {
             id
             householdSize
@@ -64,10 +64,8 @@ def perform_mutation(
     ]
   )
     input = {
-      input: {
-        receiving_household_id: receiving_household_id,
-        joining_enrollment_inputs: joining_enrollment_inputs,
-      },
+      receiving_household_id: receiving_household_id,
+      joining_enrollment_inputs: joining_enrollment_inputs,
     }
     response, result = post_graphql(input) { mutation }
 
@@ -196,7 +194,7 @@ def perform_mutation(
       receiving_household_id: 'fake-household',
       joining_enrollment_inputs: [],
     }
-    expect_access_denied post_graphql(input: input) { mutation }
+    expect_access_denied post_graphql(**input) { mutation }
   end
 
   it 'fails when the user does not have can_split_households permission' do
@@ -205,7 +203,7 @@ def perform_mutation(
       receiving_household_id: receiving_enrollment.household_id,
       joining_enrollment_inputs: [],
     }
-    expect_access_denied post_graphql(input: input) { mutation }
+    expect_access_denied post_graphql(**input) { mutation }
   end
 
   it 'fails when the given joining enrollment IDs are invalid' do
@@ -218,7 +216,7 @@ def perform_mutation(
         },
       ],
     }
-    expect_access_denied post_graphql(input: input) { mutation }
+    expect_access_denied post_graphql(**input) { mutation }
   end
 
   it 'fails when the given joining enrollment ID comes from a different project' do
@@ -233,7 +231,7 @@ def perform_mutation(
         },
       ],
     }
-    expect_access_denied post_graphql(input: input) { mutation }
+    expect_access_denied post_graphql(**input) { mutation }
   end
 
   it 'fails when the join would leave behind a headless household' do
@@ -246,6 +244,6 @@ def perform_mutation(
         },
       ],
     }
-    expect_gql_error post_graphql(input: input) { mutation }, message: /This operation would leave behind a household with no HoH/
+    expect_gql_error post_graphql(**input) { mutation }, message: /This operation would leave behind a household with no HoH/
   end
 end