fix(TransactionReports): Only include transactions for current host f…

…or accounts with v3 budget (#10077)
opencollective · May 8, 2024 · 151c646 · 151c646
1 parent 97cb7f1
commit 151c646
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/graphql/v2/interface/Account.ts b/server/graphql/v2/interface/Account.ts
@@ -843,6 +843,7 @@ const accountFieldsDefinition = () => ({
       if (args.timeUnit !== 'MONTH' && args.timeUnit !== 'QUARTER' && args.timeUnit !== 'YEAR') {
         throw new Error('Only monthly, quarterly and yearly reports are supported.');
       }
+      const budgetVersion = get(collective, 'settings.budget.version', 'v2');
 
       const query = `
         WITH
@@ -894,8 +895,9 @@ const accountFieldsDefinition = () => ({
                     ) AS e ON t."ExpenseId" IS NOT NULL
                 WHERE
                     t."deletedAt" IS NULL
-                    AND t."CollectiveId" IN (SELECT * FROM CollectiveIds)
+                    AND t."CollectiveId" IN (SELECT "id" FROM CollectiveIds)
                     ${args.dateTo ? 'AND t."createdAt" <= :dateTo' : ''}
+                    ${budgetVersion === 'v3' ? 'AND t."HostCollectiveId" = :hostCollectiveId' : ''}
 
                 GROUP BY
                     DATE_TRUNC(:timeUnit, t."createdAt"),
@@ -910,6 +912,7 @@ const accountFieldsDefinition = () => ({
       const queryResult = await sequelize.query(query, {
         replacements: {
           collectiveId: collective.id,
+          hostCollectiveId: collective.HostCollectiveId,
           timeUnit: args.timeUnit,
           dateTo: moment(args.dateTo).utc().toISOString(),
         },