feat: Allow exclude transfer txs from GET /transactions

letehaha · Jan 21, 2024 · 1378f24 · 1378f24
1 parent b028fb0
commit 1378f24
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 22 deletions.
diff --git a/shared-types/routes/transactions.ts b/shared-types/routes/transactions.ts
@@ -18,6 +18,7 @@ export interface GetTransactionsQuery extends QueryPayload {
   type?: TRANSACTION_TYPES;
   accountType?: ACCOUNT_TYPES;
   accountId?: number;
+  excludeTransfer?: boolean;
 }
 
 export type GetTransactionsResponse = TransactionModel[];

diff --git a/src/controllers/transactions.controller.ts b/src/controllers/transactions.controller.ts
@@ -1,4 +1,8 @@
-import { API_RESPONSE_STATUS, SORT_DIRECTIONS } from 'shared-types';
+import {
+  API_RESPONSE_STATUS,
+  SORT_DIRECTIONS,
+  endpointsTypes,
+} from 'shared-types';
 import { CustomResponse } from '@common/types';
 import { ValidationError } from '@js/errors';
 import * as transactionsService from '@services/transactions';
@@ -8,7 +12,7 @@ export const getTransactions = async (req, res: CustomResponse) => {
   try {
     const { id: userId } = req.user;
     const {
-      sortDirection = SORT_DIRECTIONS.desc,
+      sort = SORT_DIRECTIONS.desc,
       limit,
       from = 0,
       type: transactionType,
@@ -19,13 +23,14 @@ export const getTransactions = async (req, res: CustomResponse) => {
       includeCategory,
       includeAll,
       nestedInclude,
-      isRaw,
-    } = req.query;
+      // isRaw,
+      excludeTransfer,
+    }: endpointsTypes.GetTransactionsQuery = req.query;
 
     const data = await transactionsService.getTransactions({
       userId,
       transactionType,
-      sortDirection,
+      sortDirection: sort,
       limit,
       from,
       accountType,
@@ -35,7 +40,8 @@ export const getTransactions = async (req, res: CustomResponse) => {
       includeCategory,
       includeAll,
       nestedInclude,
-      isRaw,
+      excludeTransfer,
+      isRaw: false,
     });
 
     return res.status(200).json({

diff --git a/src/models/Transactions.model.ts b/src/models/Transactions.model.ts
@@ -379,6 +379,7 @@ export const getTransactions = async (
     includeAll,
     nestedInclude,
     isRaw = false,
+    excludeTransfer,
   }: {
     from: number;
     limit: number;
@@ -393,6 +394,7 @@ export const getTransactions = async (
     includeAll: boolean;
     nestedInclude: boolean;
     isRaw: boolean;
+    excludeTransfer?: boolean;
   },
   { transaction }: { transaction?: Transaction } = {},
 ) => {
@@ -408,7 +410,14 @@ export const getTransactions = async (
     include,
     where: {
       userId,
-      ...removeUndefinedKeys({ accountType, accountId, transactionType }),
+      ...removeUndefinedKeys({
+        accountType,
+        accountId,
+        transactionType,
+        transferNature: excludeTransfer
+          ? TRANSACTION_TRANSFER_NATURE.not_transfer
+          : undefined,
+      }),
     },
     transaction,
     offset: from,

diff --git a/src/models/transactions.ts b/src/models/transactions.ts
@@ -1,17 +1,22 @@
-import { ACCOUNT_TYPES, SORT_DIRECTIONS, TRANSACTION_TYPES } from 'shared-types';
+import {
+  ACCOUNT_TYPES,
+  SORT_DIRECTIONS,
+  TRANSACTION_TYPES,
+} from 'shared-types';
 
 export interface GetTransactionsParams {
-  userId: number,
-  sortDirection: SORT_DIRECTIONS,
-  includeUser: boolean,
-  includeAccount: boolean,
-  includeCategory: boolean,
-  includeAll: boolean,
-  nestedInclude: boolean,
-  transactionType: TRANSACTION_TYPES,
-  limit: number,
-  from: number,
-  accountType: ACCOUNT_TYPES,
-  accountId: number,
-  isRaw: boolean
-}
+  userId: number;
+  sortDirection: SORT_DIRECTIONS;
+  includeUser: boolean;
+  includeAccount: boolean;
+  includeCategory: boolean;
+  includeAll: boolean;
+  nestedInclude: boolean;
+  transactionType: TRANSACTION_TYPES;
+  limit: number;
+  from: number;
+  accountType: ACCOUNT_TYPES;
+  accountId: number;
+  isRaw: boolean;
+  excludeTransfer?: boolean;
+}