fix(Members): enforce currency for totalAmountDonatedFromTo

Author: Betree

server/graphql/loaders/index.ts

@@ -1122,13 +1122,17 @@ export const generateLoaders = req => {
           });
         }),
       ),
-      totalAmountDonatedFromTo: new DataLoader<{ CollectiveId: number; FromCollectiveId: number }, number>(keys =>
-        Transaction.findAll({
+      totalAmountDonatedFromTo: new DataLoader<
+        { CollectiveId: number; FromCollectiveId: number; currency: SupportedCurrency },
+        number
+      >(async keys => {
+        const results = (await Transaction.findAll({
           attributes: [
             'FromCollectiveId',
             'UsingGiftCardFromCollectiveId',
             'CollectiveId',
             [sequelize.fn('SUM', sequelize.col('amount')), 'totalAmount'],
+            'currency',
           ],
           where: {
             [Op.or]: {
@@ -1149,26 +1153,48 @@ export const generateLoaders = req => {
             kind: { [Op.notIn]: ['HOST_FEE', 'HOST_FEE_SHARE', 'HOST_FEE_SHARE_DEBT', 'PLATFORM_TIP_DEBT'] },
             RefundTransactionId: null,
           },
-          group: ['FromCollectiveId', 'UsingGiftCardFromCollectiveId', 'CollectiveId'],
-        }).then(results => {
-          const resultsByKey = {};
-          results.forEach(({ CollectiveId, FromCollectiveId, UsingGiftCardFromCollectiveId, dataValues }) => {
-            // Credit collective that emitted the gift card (if any)
-            if (UsingGiftCardFromCollectiveId) {
-              const key = `${UsingGiftCardFromCollectiveId}-${CollectiveId}`;
-              const donated = resultsByKey[key] || 0;
-              resultsByKey[key] = donated + dataValues['totalAmount'];
+          group: ['FromCollectiveId', 'UsingGiftCardFromCollectiveId', 'CollectiveId', 'currency'],
+          raw: true,
+          mapToModel: false,
+        })) as unknown as Array<{
+          FromCollectiveId: number;
+          UsingGiftCardFromCollectiveId: number;
+          CollectiveId: number;
+          currency: SupportedCurrency;
+          totalAmount: number;
+        }>;
+
+        const resultsByKey: Record<`${number}-${number}`, Partial<Record<SupportedCurrency, number>>> = {};
+        results.forEach(({ CollectiveId, FromCollectiveId, UsingGiftCardFromCollectiveId, currency, totalAmount }) => {
+          // Credit collective that emitted the gift card (if any)
+          if (UsingGiftCardFromCollectiveId) {
+            const key = `${UsingGiftCardFromCollectiveId}-${CollectiveId}`;
+            resultsByKey[key] = resultsByKey[key] || {};
+            resultsByKey[key][currency] = (resultsByKey[key][currency] || 0) + totalAmount;
+          }
+          // Credit collective who actually made the transaction
+          const key = `${FromCollectiveId}-${CollectiveId}`;
+          resultsByKey[key] = resultsByKey[key] || {};
+          resultsByKey[key][currency] = (resultsByKey[key][currency] || 0) + totalAmount;
+        });
+
+        return Promise.all(
+          keys.map(async key => {
+            const results = resultsByKey[`${key.FromCollectiveId}-${key.CollectiveId}`] || {};
+            let total = 0;
+            for (const [resultCurrency, resultAmount] of Object.entries(results)) {
+              const fxRate = await req.loaders.CurrencyExchangeRate.fxRate.load({
+                fromCurrency: resultCurrency,
+                toCurrency: key.currency,
+              });
+
+              total += resultAmount * fxRate;
             }
-            // Credit collective who actually made the transaction
-            const key = `${FromCollectiveId}-${CollectiveId}`;
-            const donated = resultsByKey[key] || 0;
-            resultsByKey[key] = donated + dataValues['totalAmount'];
-          });
-          return keys.map(key => {
-            return resultsByKey[`${key.FromCollectiveId}-${key.CollectiveId}`] || 0;
-          });
-        }),
-      ),
+
+            return Math.round(total);
+          }),
+        );
+      }),
       hostFeeAmountForTransaction: transactionLoaders.generateHostFeeAmountForTransactionLoader(),
       paymentProcessorFeeAmountForTransaction:
         transactionLoaders.generatePaymentProcessorFeeAmountForTransactionLoader(),

server/graphql/v1/types.js

@@ -283,12 +283,14 @@ const StatsMemberType = new GraphQLObjectType({
       totalDonations: {
         type: GraphQLFloat,
         description: 'total amount donated by this member either directly or using a gift card it has emitted',
-        resolve(member, args, req) {
+        async resolve(member, args, req) {
+          const collective = member.collective || (await req.loaders.Collective.byId.load(member.CollectiveId));
           return (
             member.totalDonations ||
             req.loaders.Transaction.totalAmountDonatedFromTo.load({
               FromCollectiveId: member.MemberCollectiveId,
               CollectiveId: member.CollectiveId,
+              currency: collective.currency,
             })
           );
         },

server/graphql/v2/object/Member.ts

@@ -6,7 +6,7 @@ import { checkScope } from '../../common/scope-check';
 import { GraphQLMemberRole } from '../enum/MemberRole';
 import { idEncode } from '../identifiers';
 import { GraphQLAccount } from '../interface/Account';
-import { GraphQLAmount } from '../object/Amount';
+import { GraphQLAmount, GraphQLAmountFields } from '../object/Amount';
 import { GraphQLTier } from '../object/Tier';
 
 const getMemberFields = () => ({
@@ -54,15 +54,18 @@ const getMemberFields = () => ({
   totalDonations: {
     type: new GraphQLNonNull(GraphQLAmount),
     description: 'Total amount donated',
-    async resolve(member, args, req) {
+    async resolve(member, args, req): Promise<GraphQLAmountFields> {
+      const collective = await req.loaders.Collective.byId.load(member.CollectiveId);
       if (member.totalDonations) {
-        return { value: member.totalDonations };
+        return { value: member.totalDonations, currency: collective.currency };
       }
-      const collective = await req.loaders.Collective.byId.load(member.CollectiveId);
+
       const value = await req.loaders.Transaction.totalAmountDonatedFromTo.load({
         FromCollectiveId: member.MemberCollectiveId,
         CollectiveId: member.CollectiveId,
+        currency: collective.currency,
       });
+
       return { value, currency: collective.currency };
     },
   },

server/graphql/v2/object/Order.js

@@ -205,6 +205,7 @@ export const GraphQLOrder = new GraphQLObjectType({
           const value = await req.loaders.Transaction.totalAmountDonatedFromTo.load({
             FromCollectiveId: order.FromCollectiveId,
             CollectiveId: order.CollectiveId,
+            currency: order.currency,
           });
           return { value, currency: order.currency };
         },