Remove ContactPrimaryAddress schema, resolvers, and related hooks from the codebase

Author: zweatshirt

pages/api/Schema/ContactPrimaryAddress/contactPrimaryAddress.graphql

@@ -7,8 +7,6 @@ import AccountListDonorAccountsTypeDefs from './AccountListDonorAccounts/account
 import { AccountListDonorAccountsResolvers } from './AccountListDonorAccounts/resolvers';
 import CoachingAnswerSetsTypeDefs from './CoachingAnswerSets/coachingAnswerSets.graphql';
 import { CoachingAnswerSetsResolvers } from './CoachingAnswerSets/resolvers';
-import ContactPrimaryAddressTypeDefs from './ContactPrimaryAddress/contactPrimaryAddress.graphql';
-import { ContactPrimaryAddressResolvers } from './ContactPrimaryAddress/resolvers';
 import DestroyDonorAccountTypeDefs from './Contacts/DonorAccounts/Destroy/destroyDonorAccount.graphql';
 import { DestroyDonorAccountResolvers } from './Contacts/DonorAccounts/Destroy/resolvers';
 import ExportContactsTypeDefs from './ExportContacts/exportContacts.graphql';
@@ -72,10 +70,6 @@ const schema = buildSubgraphSchema([
     typeDefs: AppointmentResultsTypeDefs,
     resolvers: AppointmentResultsResolvers,
   },
-  {
-    typeDefs: ContactPrimaryAddressTypeDefs,
-    resolvers: ContactPrimaryAddressResolvers,
-  },
   { typeDefs: ExportContactsTypeDefs, resolvers: ExportContactsResolvers },
   { typeDefs: MergeContactsTypeDefs, resolvers: MergeContactsResolvers },
   { typeDefs: MergePeopleBulkTypeDefs, resolvers: MergePeopleBulkResolvers },

pages/api/Schema/ContactPrimaryAddress/datahandler.ts

@@ -20,7 +20,6 @@ import {
   getCoachingAnswerSet,
   getCoachingAnswerSets,
 } from './Schema/CoachingAnswerSets/dataHandler';
-import { readExistingAddresses } from './Schema/ContactPrimaryAddress/datahandler';
 import {
   DestroyDonorAccount,
   DestroyDonorAccountResponse,
@@ -416,53 +415,6 @@ class MpdxRestApi extends RESTDataSource {
     return getCoachingAnswer(res);
   }
 
-  // TODO: This should be merged with the updateContact mutation by adding the ability to update
-  // the primaryMailingAddress field when we have API resources again
-  async setContactPrimaryAddress(
-    contactId: string,
-    primaryAddressId: string | null | undefined,
-  ) {
-    // Setting primary_mailing_address to true on one address doesn't set it to false on all the
-    // others, so we have to load all the existing addresses and update all of their
-    // primary_mailing_address attributes
-    const getAddressesResponse = await this.get(
-      `contacts/${contactId}?include=addresses`,
-    );
-    const addresses = readExistingAddresses(getAddressesResponse).map(
-      (address) => ({
-        ...address,
-        primaryMailingAddress: address.id === primaryAddressId,
-      }),
-    );
-    await this.put(`contacts/${contactId}`, {
-      body: {
-        included: addresses.map(({ id, primaryMailingAddress }) => ({
-          type: 'addresses',
-          id,
-          attributes: {
-            primary_mailing_address: primaryMailingAddress,
-          },
-        })),
-        data: {
-          type: 'contacts',
-          id: contactId,
-          attributes: { overwrite: true },
-          relationships: {
-            addresses: {
-              data: addresses.map(({ id }) => ({
-                type: 'addresses',
-                id,
-              })),
-            },
-          },
-        },
-      },
-    });
-    return {
-      addresses,
-    };
-  }
-
   async getExpectedMonthlyTotalReport(
     accountListId: string,
     designationAccountId: string[] | null | undefined,

pages/api/Schema/ContactPrimaryAddress/resolvers.ts

@@ -23,7 +23,6 @@ import {
   ContactInputWrapper,
 } from 'src/components/Shared/styledComponents/ContactStyling';
 import { LoadingIndicator } from 'src/components/Shared/styledComponents/LoadingStyling';
-import { useUpdateCache } from 'src/hooks/useUpdateCache';
 import Modal from '../../../../../Shared/Modal/Modal';
 import {
   ContactDetailsTabDocument,
@@ -53,7 +52,6 @@ export const AddAddressModal: React.FC<EditContactAddressModalProps> = ({
     useCreateContactAddressMutation();
   const [setContactPrimaryAddress, { loading: settingPrimaryAddress }] =
     useSetContactPrimaryAddressMutation();
-  const { update } = useUpdateCache(contactId);
 
   const onSubmit = async ({
     primaryMailingAddress,
@@ -110,10 +108,10 @@ export const AddAddressModal: React.FC<EditContactAddressModalProps> = ({
     if (primaryMailingAddress && newAddressId) {
       await setContactPrimaryAddress({
         variables: {
+          accountListId,
           contactId,
           primaryAddressId: newAddressId,
         },
-        update,
       });
     }
     enqueueSnackbar(t('Address added successfully'), {

pages/api/Schema/index.ts

@@ -27,7 +27,6 @@ import {
   ContactInputWrapper,
 } from 'src/components/Shared/styledComponents/ContactStyling';
 import { LoadingIndicator } from 'src/components/Shared/styledComponents/LoadingStyling';
-import { useUpdateCache } from 'src/hooks/useUpdateCache';
 import { isEditableSource } from 'src/lib/sourceHelper';
 import Modal from '../../../../../Shared/Modal/Modal';
 import {
@@ -70,7 +69,6 @@ export const EditContactAddressModal: React.FC<
     useDeleteContactAddressMutation();
   const [setContactPrimaryAddress, { loading: settingPrimaryAddress }] =
     useSetContactPrimaryAddressMutation();
-  const { update } = useUpdateCache(contactId);
 
   const onSubmit = async ({
     primaryMailingAddress,
@@ -92,10 +90,10 @@ export const EditContactAddressModal: React.FC<
     if (address.primaryMailingAddress !== primaryMailingAddress) {
       await setContactPrimaryAddress({
         variables: {
+          accountListId,
           contactId,
           primaryAddressId: primaryMailingAddress ? address.id : null,
         },
-        update,
       });
     }
     enqueueSnackbar(t('Address updated successfully'), {

pages/api/graphql-rest.page.ts

@@ -1,20 +1,25 @@
-fragment PrimaryMailingAddress on Address {
-  primaryMailingAddress
-}
-
-fragment ContactPrimaryAddressRelation on Contact {
-  primaryAddress {
-    id
-  }
-}
-
-mutation SetContactPrimaryAddress($contactId: ID!, $primaryAddressId: ID) {
-  setContactPrimaryAddress(
-    input: { contactId: $contactId, primaryAddressId: $primaryAddressId }
+mutation SetContactPrimaryAddress(
+  $accountListId: ID!
+  $contactId: ID!
+  $primaryAddressId: String
+) {
+  updateContact(
+    input: {
+      accountListId: $accountListId
+      attributes: { id: $contactId, primaryAddressId: $primaryAddressId }
+    }
   ) {
-    addresses {
+    contact {
       id
-      primaryMailingAddress
+      primaryAddress {
+        id
+      }
+      addresses(first: 25) {
+        nodes {
+          id
+          primaryMailingAddress
+        }
+      }
     }
   }
 }

src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/AddAddressModal/AddAddressModal.tsx

@@ -173,6 +173,7 @@ describe('CreateMultipleContacts', () => {
         },
       });
       expect(mutationSpy).toHaveGraphqlOperation('SetContactPrimaryAddress', {
+        accountListId,
         contactId: 'contact-1',
         primaryAddressId: 'address-1',
       });
@@ -506,6 +507,7 @@ describe('CreateMultipleContacts', () => {
         },
       });
       expect(mutationSpy).toHaveGraphqlOperation('SetContactPrimaryAddress', {
+        accountListId,
         contactId: 'contact-1',
         primaryAddressId: 'address-1',
       });

src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx

@@ -235,6 +235,7 @@ export const CreateMultipleContacts = ({
               if (addressId) {
                 await setPrimaryAddress({
                   variables: {
+                    accountListId,
                     contactId,
                     primaryAddressId: addressId,
                   },