QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: sort the matched transactions

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-07-01 13:03:38 +02:00
parent c27458ebcc
commit 79616cf1eb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/server/src/services/Banking/Matching/GetMatchedTransactions.ts
View File

@@ -7,6 +7,7 @@ import { GetMatchedTransactionsByExpenses } from './GetMatchedTransactionsByExpe
import { GetMatchedTransactionsByBills } from './GetMatchedTransactionsByBills';
import { GetMatchedTransactionsByManualJournals } from './GetMatchedTransactionsByManualJournals';
import HasTenancyService from '@/services/Tenancy/TenancyService';
import { sortClosestMatchTransactions } from './_utils';
@Service()
export class GetMatchedTransactions {
@@ -88,14 +89,19 @@ export class GetMatchedTransactions {
): MatchedTransactionsPOJO {
const results = R.compose(R.flatten)(matchedTransactions?.results);
// Sort the results based on amount, date, and transaction type
const closestResullts = sortClosestMatchTransactions(
uncategorizedTransaction,
results
);
const perfectMatches = R.filter(
(match) =>
match.amount === uncategorizedTransaction.amount &&
moment(match.date).isSame(uncategorizedTransaction.date, 'day'),
results
closestResullts
);
const possibleMatches = R.difference(results, perfectMatches);
const possibleMatches = R.difference(closestResullts, perfectMatches);
return { perfectMatches, possibleMatches };
}

5
packages/server/src/services/Banking/Matching/types.ts
View File

@@ -47,11 +47,12 @@ export interface MatchedTransactionPOJO {
referenceNo: string;
transactionNo: string;
transactionId: number;
transactionType: string;
}
export type MatchedTransactionsPOJO = {
perfectMatches: Array<MatchedTransactionPOJO[]>;
possibleMatches: Array<MatchedTransactionPOJO[]>;
perfectMatches: Array<MatchedTransactionPOJO>;
possibleMatches: Array<MatchedTransactionPOJO>;
};
export const ERRORS = {