Merge pull request #568 from bigcapitalhq/fix-banking-api-query

fix: Banking API account and page query.
bigcapitalhq · Aug 7, 2024 · 3fcc70c · 3fcc70c
2 parents 37e25a8 + a986c7a
commit 3fcc70c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/packages/server/src/api/controllers/Banking/ExcludeBankTransactionsController.ts b/packages/server/src/api/controllers/Banking/ExcludeBankTransactionsController.ts
@@ -42,7 +42,11 @@ export class ExcludeBankTransactionsController extends BaseController {
     );
     router.get(
       '/excluded',
-      [],
+      [
+        query('account_id').optional().isNumeric().toInt(),
+        query('page').optional().isNumeric().toInt(),
+        query('page_size').optional().isNumeric().toInt(),
+      ],
       this.validationResult,
       this.getExcludedBankTransactions.bind(this)
     );
@@ -177,7 +181,7 @@ export class ExcludeBankTransactionsController extends BaseController {
     next: NextFunction
   ): Promise<Response | void> {
     const { tenantId } = req;
-    const filter = this.matchedBodyData(req);
+    const filter = this.matchedQueryData(req);
 
     try {
       const data =

diff --git a/packages/server/src/api/controllers/Banking/RecognizedTransactionsController.ts b/packages/server/src/api/controllers/Banking/RecognizedTransactionsController.ts
@@ -1,5 +1,6 @@
 import { Inject, Service } from 'typedi';
 import { NextFunction, Request, Response, Router } from 'express';
+import { query } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 
@@ -14,7 +15,16 @@ export class RecognizedTransactionsController extends BaseController {
   router() {
     const router = Router();
 
-    router.get('/', this.getRecognizedTransactions.bind(this));
+    router.get(
+      '/',
+      [
+        query('page').optional().isNumeric().toInt(),
+        query('page_size').optional().isNumeric().toInt(),
+        query('account_id').optional().isNumeric().toInt(),
+      ],
+      this.validationResult,
+      this.getRecognizedTransactions.bind(this)
+    );
     router.get(
       '/transactions/:uncategorizedTransactionId',
       this.getRecognizedTransaction.bind(this)

diff --git a/...s/CashFlow/AccountTransactions/RecognizedTransactions/RecognizedTransactionsTableBoot.tsx b/...s/CashFlow/AccountTransactions/RecognizedTransactions/RecognizedTransactionsTableBoot.tsx
@@ -43,6 +43,7 @@ function RecognizedTransactionsTableBoot({
     hasNextPage: hasUncategorizedTransactionsNextPage,
   } = useRecognizedBankTransactionsInfinity({
     page_size: 50,
+    account_id: accountId,
   });
   // Memorized the cashflow account transactions.
   const recognizedTransactions = React.useMemo(

diff --git a/packages/webapp/src/hooks/query/bank-rules.ts b/packages/webapp/src/hooks/query/bank-rules.ts
@@ -276,6 +276,11 @@ const onValidateExcludeUncategorizedTransaction = (queryClient) => {
 
   // invalidate bank account summary.
   queryClient.invalidateQueries(BANK_QUERY_KEY.BANK_ACCOUNT_SUMMARY_META);
+
+  // Invalidate the recognized transactions.
+  queryClient.invalidateQueries([
+    BANK_QUERY_KEY.RECOGNIZED_BANK_TRANSACTIONS_INFINITY,
+  ]);
 };
 
 type ExcludeUncategorizedTransactionValue = number;
@@ -312,10 +317,6 @@ export function useExcludeUncategorizedTransaction(
     {
       onSuccess: (res, id) => {
         onValidateExcludeUncategorizedTransaction(queryClient);
-        queryClient.invalidateQueries([
-          BANK_QUERY_KEY.BANK_ACCOUNT_SUMMARY_META,
-          id,
-        ]);
       },
       ...options,
     },
@@ -357,10 +358,6 @@ export function useUnexcludeUncategorizedTransaction(
     {
       onSuccess: (res, id) => {
         onValidateExcludeUncategorizedTransaction(queryClient);
-        queryClient.invalidateQueries([
-          BANK_QUERY_KEY.BANK_ACCOUNT_SUMMARY_META,
-          id,
-        ]);
       },
       ...options,
     },
@@ -649,7 +646,6 @@ export function useRecognizedBankTransactionsInfinity(
       getPreviousPageParam: (firstPage) => firstPage.pagination.page - 1,
       getNextPageParam: (lastPage) => {
         const { pagination } = lastPage;
-
         return pagination.total > pagination.page_size * pagination.page
           ? lastPage.pagination.page + 1
           : undefined;