QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-14 11:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter the uncategorized transactions out of matched transactions

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-07-03 17:23:12 +02:00
parent 91730d204e
commit 67b519db61
19 changed files with 98 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/server/src/api/controllers/Banking/BankTransactionsMatchingController.ts
View File

@@ -5,7 +5,7 @@ import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/Ma
import { body, param } from 'express-validator';
import {
GetMatchedTransactionsFilter,
IMatchTransactionDTO,
IMatchTransactionsDTO,
} from '@/services/Banking/Matching/types';
@Service()
@@ -44,10 +44,10 @@ export class BankTransactionsMatchingController extends BaseController {
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @returns
* @returns {Promise<Response|null>}
*/
private async matchBankTransaction(
req: Request,
req: Request<{ transactionId: number }>,
res: Response,
next: NextFunction
) {
@@ -55,7 +55,7 @@ export class BankTransactionsMatchingController extends BaseController {
const { transactionId } = req.params;
const matchTransactionDTO = this.matchedBodyData(
req
) as IMatchTransactionDTO;
) as IMatchTransactionsDTO;
try {
await this.bankTransactionsMatchingApp.matchTransaction(
@@ -64,6 +64,7 @@ export class BankTransactionsMatchingController extends BaseController {
matchTransactionDTO
);
return res.status(200).send({
id: transactionId,
message: 'The bank transaction has been matched.',
});
} catch (error) {
@@ -72,60 +73,31 @@ export class BankTransactionsMatchingController extends BaseController {
}
/**
*
* Unmatches the matched bank transaction.
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @returns
* @returns {Promise<Response|null>}
*/
private async unmatchMatchedBankTransaction(
req: Request,
req: Request<{ transactionId: number }>,
res: Response,
next: NextFunction
) {
const { tenantId } = req;
const transactionId = req.params?.transactionId;
const { transactionId } = req.params;
try {
await this.bankTransactionsMatchingApp.unmatchMatchedTransaction(
tenantId,
transactionId
);
return res.status(200).send({
id: transactionId,
message: 'The bank matched transaction has been unmatched.',
});
} catch (error) {
next(error);
}
}
/**
* Retrieves the matched transactions.
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
*/
private async getMatchedTransactions(
req: Request,
res: Response,
next: NextFunction
) {
const { tenantId } = req;
const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter;
console.log('test');
try {
const matchedTransactions =
await this.bankTransactionsMatchingApp.getMatchedTransactions(
tenantId,
filter
);
return res.status(200).send({ data: matchedTransactions });
} catch (error) {
next(error);
}
}
}