Set expenditureId field for MOVE_FUNDS motions that are funding expenditures

Author: jakubcolony

src/handlers/actions/moveFunds.ts

@@ -9,18 +9,16 @@ import {
   isDomainFromFundingPotSupported,
   getUpdatedExpenditureBalances,
   transactionHasEvent,
+  getExpenditureByFundingPot,
 } from '~utils';
 import {
   ColonyActionType,
   ExpenditureFragment,
-  GetExpenditureByNativeFundingPotIdAndColonyDocument,
-  GetExpenditureByNativeFundingPotIdAndColonyQuery,
-  GetExpenditureByNativeFundingPotIdAndColonyQueryVariables,
   UpdateExpenditureDocument,
   UpdateExpenditureMutation,
   UpdateExpenditureMutationVariables,
 } from '~graphql';
-import { mutate, query } from '~amplifyClient';
+import { mutate } from '~amplifyClient';
 
 export default async (event: ContractEvent): Promise<void> => {
   const {
@@ -90,25 +88,6 @@ export default async (event: ContractEvent): Promise<void> => {
   }
 };
 
-const getExpenditureByFundingPot = async (
-  colonyAddress: string,
-  fundingPotId: number,
-): Promise<ExpenditureFragment | null> => {
-  const response = await query<
-    GetExpenditureByNativeFundingPotIdAndColonyQuery,
-    GetExpenditureByNativeFundingPotIdAndColonyQueryVariables
-  >(GetExpenditureByNativeFundingPotIdAndColonyDocument, {
-    colonyAddress,
-    nativeFundingPotId: fundingPotId,
-  });
-
-  const expenditure =
-    response?.data?.getExpendituresByNativeFundingPotIdAndColony?.items?.[0] ??
-    null;
-
-  return expenditure;
-};
-
 const updateExpenditureBalances = async (
   expenditure: ExpenditureFragment,
   tokenAddress: string,

src/handlers/motions/motionCreated/handlers/moveFunds.ts

@@ -5,6 +5,7 @@ import { ContractEvent, motionNameMapping } from '~types';
 import {
   getCachedColonyClient,
   getDomainDatabaseId,
+  getExpenditureByFundingPot,
   isDomainFromFundingPotSupported,
   toNumber,
 } from '~utils';
@@ -53,6 +54,12 @@ export const handleMoveFundsMotion = async (
     });
   }
 
+  // Check if the target pot belongs to an expenditure
+  const targetExpenditure = await getExpenditureByFundingPot(
+    colonyAddress,
+    toNumber(toPot),
+  );
+
   await createMotionInDB(colonyAddress, event, {
     type: motionNameMapping[name],
     tokenAddress,
@@ -63,5 +70,6 @@ export const handleMoveFundsMotion = async (
     toDomainId: toDomainId
       ? getDomainDatabaseId(colonyAddress, toNumber(toDomainId))
       : undefined,
+    expenditureId: targetExpenditure?.id,
   });
 };

src/handlers/multiSig/multiSigCreated/handlers/moveFunds.ts

@@ -3,6 +3,7 @@ import { ContractEvent, multiSigNameMapping } from '~types';
 import {
   getCachedColonyClient,
   getDomainDatabaseId,
+  getExpenditureByFundingPot,
   isDomainFromFundingPotSupported,
   toNumber,
 } from '~utils';
@@ -54,6 +55,12 @@ export const handleMoveFundsMultiSig = async (
     });
   }
 
+  // Check if the target pot belongs to an expenditure
+  const targetExpenditure = await getExpenditureByFundingPot(
+    colonyAddress,
+    toNumber(toPot),
+  );
+
   await createMultiSigInDB(colonyAddress, event, {
     type: multiSigNameMapping[name],
     tokenAddress,
@@ -64,5 +71,6 @@ export const handleMoveFundsMultiSig = async (
     toDomainId: toDomainId
       ? getDomainDatabaseId(colonyAddress, toNumber(toDomainId))
       : undefined,
+    expenditureId: targetExpenditure?.id,
   });
 };

src/utils/expenditures.ts

@@ -1,6 +1,13 @@
 import { BigNumber, utils } from 'ethers';
+import { query } from '~amplifyClient';
 
-import { ExpenditureBalance } from '~graphql';
+import {
+  ExpenditureBalance,
+  ExpenditureFragment,
+  GetExpenditureByNativeFundingPotIdAndColonyDocument,
+  GetExpenditureByNativeFundingPotIdAndColonyQuery,
+  GetExpenditureByNativeFundingPotIdAndColonyQueryVariables,
+} from '~graphql';
 
 import { insertAtIndex } from './arrays';
 
@@ -48,3 +55,22 @@ export const getUpdatedExpenditureBalances = (
 
   return updatedBalances;
 };
+
+export const getExpenditureByFundingPot = async (
+  colonyAddress: string,
+  fundingPotId: number,
+): Promise<ExpenditureFragment | null> => {
+  const response = await query<
+    GetExpenditureByNativeFundingPotIdAndColonyQuery,
+    GetExpenditureByNativeFundingPotIdAndColonyQueryVariables
+  >(GetExpenditureByNativeFundingPotIdAndColonyDocument, {
+    colonyAddress,
+    nativeFundingPotId: fundingPotId,
+  });
+
+  const expenditure =
+    response?.data?.getExpendituresByNativeFundingPotIdAndColony?.items?.[0] ??
+    null;
+
+  return expenditure;
+};