diff --git a/packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts b/packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts index 393cdfcf9..c7d57105c 100644 --- a/packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts +++ b/packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts @@ -49,7 +49,7 @@ export default class GetCashflowAccounts extends BaseController { * @param {NextFunction} next */ private getCashflowTransaction = async ( - req: Request, + req: Request<{ transactionId: number }>, res: Response, next: NextFunction ) => { @@ -76,13 +76,17 @@ export default class GetCashflowAccounts extends BaseController { * @param {NextFunction} next */ private async getMatchedTransactions( - req: Request<{ transactionId: number }>, + req: Request< + { transactionId: number }, + null, + null, + { uncategorizeTransactionsIds: Array } + >, res: Response, next: NextFunction ) { const { tenantId } = req; - const uncategorizeTransactionsIds: Array = - req.query.uncategorizeTransactionsIds; + const uncategorizeTransactionsIds = req.query.uncategorizeTransactionsIds; const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter; try { diff --git a/packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts b/packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts index 51f45396a..5e204ca12 100644 --- a/packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts +++ b/packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts @@ -167,7 +167,7 @@ export default class NewCashflowTransactionController extends BaseController { * @param {NextFunction} next */ private revertCategorizedCashflowTransaction = async ( - req: Request, + req: Request<{ id: number }>, res: Response, next: NextFunction ) => { @@ -280,7 +280,7 @@ export default class NewCashflowTransactionController extends BaseController { * @param {NextFunction} next */ public getUncategorizedCashflowTransactions = async ( - req: Request, + req: Request<{ id: number }>, res: Response, next: NextFunction ) => { diff --git a/packages/server/src/services/Banking/Matching/GetMatchedTransactionsByType.ts b/packages/server/src/services/Banking/Matching/GetMatchedTransactionsByType.ts index df35a9d9b..5d39c0740 100644 --- a/packages/server/src/services/Banking/Matching/GetMatchedTransactionsByType.ts +++ b/packages/server/src/services/Banking/Matching/GetMatchedTransactionsByType.ts @@ -44,7 +44,7 @@ export abstract class GetMatchedTransactionsByType { } /** - * + * Creates the common matched transaction. * @param {number} tenantId * @param {Array} uncategorizedTransactionIds * @param {IMatchTransactionDTO} matchTransactionDTO diff --git a/packages/server/src/services/Banking/Matching/MatchTransactions.ts b/packages/server/src/services/Banking/Matching/MatchTransactions.ts index c1604d9c1..5a28dd0b1 100644 --- a/packages/server/src/services/Banking/Matching/MatchTransactions.ts +++ b/packages/server/src/services/Banking/Matching/MatchTransactions.ts @@ -54,7 +54,8 @@ export class MatchBankTransactions { const uncategorizedTransactions = await UncategorizedCashflowTransaction.query() .whereIn('id', uncategorizedTransactionIds) - .withGraphFetched('matchedBankTransactions'); + .withGraphFetched('matchedBankTransactions') + .throwIfNotFound(); // Validates the uncategorized transaction is not already matched. validateUncategorizedTransactionsNotMatched(uncategorizedTransactions);