Fix(account-transactions): Include new GraphQL args in query

opencollective · Apr 8, 2024 · 8f6386b · 8f6386b
1 parent aeb06a2
commit 8f6386b
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/src/server/controllers/account-transactions.js b/src/server/controllers/account-transactions.js
@@ -1,6 +1,6 @@
 import { Parser } from '@json2csv/plainjs';
 import gqlV2 from 'graphql-tag';
-import { difference, get, head, intersection, isNil, pick, toUpper, trim } from 'lodash';
+import { difference, get, head, intersection, pick, toUpper, trim } from 'lodash';
 import moment from 'moment';
 
 import { graphqlRequest } from '../lib/graphql';
@@ -206,6 +206,10 @@ const transactionsQuery = gqlV2/* GraphQL */ `
       includeGiftCardTransactions: $includeGiftCardTransactions
       includeRegularTransactions: $includeRegularTransactions
       paymentMethodType: $paymentMethodType
+      expenseType: $expenseType
+      expense: $expense
+      order: $order
+      isRefund: $isRefund
     ) {
       ...TransactionsFragment
     }
@@ -259,6 +263,10 @@ const hostTransactionsQuery = gqlV2/* GraphQL */ `
       includeChildrenTransactions: $includeChildrenTransactions
       includeHost: $includeHost
       paymentMethodType: $paymentMethodType
+      expenseType: $expenseType
+      expense: $expense
+      order: $order
+      isRefund: $isRefund
     ) {
       ...TransactionsFragment
     }
@@ -557,22 +565,22 @@ const accountTransactions = async (req, res) => {
     variables.kind = difference(variables.kind || allKinds, ['TAX']);
   }
 
-  if (variables.expenseType) {
-    variables.expenseType = variables.expenseType.split(',').map(toUpper).map(trim);
-  }
+  // if (variables.expenseType) {
+  //   variables.expenseType = variables.expenseType.split(',').map(toUpper).map(trim);
+  // }
 
-  if (variables.orderId) {
-    variables.order = { legacyId: parseInt(variables.orderId) };
-  }
+  // if (variables.orderId) {
+  //   variables.order = { legacyId: parseInt(variables.orderId) };
+  // }
 
-  if (variables.expenseId) {
-    variables.expense = { legacyId: parseInt(variables.expenseId) };
-  }
+  // if (variables.expenseId) {
+  //   variables.expense = { legacyId: parseInt(variables.expenseId) };
+  // }
 
-  // isRefund can be false but default should be undefined
-  if (!isNil(variables.isRefund)) {
-    variables.isRefund = parseToBooleanDefaultFalse(variables.isRefund);
-  }
+  // // isRefund can be false but default should be undefined
+  // if (!isNil(variables.isRefund)) {
+  //   variables.isRefund = parseToBooleanDefaultFalse(variables.isRefund);
+  // }
 
   if (req.query.fullDescription) {
     variables.fullDescription = parseToBooleanDefaultFalse(req.query.fullDescription);