github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-04-29 11:04:12 -05:00
Code Issues 1.3k Packages Projects Releases 54 Wiki Activity

Revert "fix(#2562): Prevent transaction deduplication for imported transactio…" (#2910)

Browse Source
This commit is contained in:
Matiss Janis Aboltins
2024-06-22 21:32:51 +01:00
committed by GitHub
parent f02ca4e3d2
commit 6a21f8e3de
3 changed files with 1 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
packages/loot-core/src/server/accounts/sync.test.ts
View File

@@ -342,108 +342,4 @@ describe('Account sync', () => {
'bakkerij-renamed',
]);
});
test('reconcile does not merge transactions with different ‘imported_id’ values', async () => {
const { id } = await prepareDatabase();
let payees = await getAllPayees();
expect(payees.length).toBe(0);
// Add first transaction
await reconcileTransactions(id, [
{
date: '2024-04-05',
amount: -1239,
imported_payee: 'Acme Inc.',
payee_name: 'Acme Inc.',
imported_id: 'b85cdd57-5a1c-4ca5-bd54-12e5b56fa02c',
notes: 'TEST TRANSACTION',
cleared: true,
},
]);
payees = await getAllPayees();
expect(payees.length).toBe(1);
let transactions = await getAllTransactions();
expect(transactions.length).toBe(1);
// Add second transaction
await reconcileTransactions(id, [
{
date: '2024-04-06',
amount: -1239,
imported_payee: 'Acme Inc.',
payee_name: 'Acme Inc.',
imported_id: 'ca1589b2-7bc3-4587-a157-476170b383a7',
notes: 'TEST TRANSACTION',
cleared: true,
},
]);
payees = await getAllPayees();
expect(payees.length).toBe(1);
transactions = await getAllTransactions();
expect(transactions.length).toBe(2);
expect(
transactions.find(
t => t.imported_id === 'b85cdd57-5a1c-4ca5-bd54-12e5b56fa02c',
).amount,
).toBe(-1239);
expect(
transactions.find(
t => t.imported_id === 'ca1589b2-7bc3-4587-a157-476170b383a7',
).amount,
).toBe(-1239);
});
test(
'given an imported tx with no imported_id, ' +
'when an existing transaction that has an imported_id and matches amount and is within 7 days of imported tx,' +
'then imported tx should reconcile with existing transaction from fuzzy match',
async () => {
const { id } = await prepareDatabase();
let payees = await getAllPayees();
expect(payees.length).toBe(0);
const existingTx = {
date: '2024-04-05',
amount: -1239,
imported_payee: 'Acme Inc.',
payee_name: 'Acme Inc.',
imported_id: 'b85cdd57-5a1c-4ca5-bd54-12e5b56fa02c',
notes: 'TEST TRANSACTION',
cleared: true,
};
// Add transaction to represent existing transaction with imoprted_id
await reconcileTransactions(id, [existingTx]);
payees = await getAllPayees();
expect(payees.length).toBe(1);
let transactions = await getAllTransactions();
expect(transactions.length).toBe(1);
// Import transaction similar to existing but with different date and no imported_id
await reconcileTransactions(id, [
{
...existingTx,
date: '2024-04-06',
imported_id: null,
},
]);
payees = await getAllPayees();
expect(payees.length).toBe(1);
transactions = await getAllTransactions();
expect(transactions.length).toBe(1);
expect(transactions[0].amount).toBe(-1239);
},
);
});

9
packages/loot-core/src/server/accounts/sync.ts
View File

@@ -400,15 +400,8 @@ export async function reconcileTransactions(
// fields.
fuzzyDataset = await db.all(
`SELECT id, is_parent, date, imported_id, payee, category, notes, reconciled FROM v_transactions
WHERE
-- If both ids are set, and we didn't match earlier then skip dedup
( imported_id IS NULL OR ? IS NULL )
-- Look 7 days ahead, 7 days behind
AND date >= ? AND date <= ? AND amount = ?
AND account = ?
`,
WHERE date >= ? AND date <= ? AND amount = ? AND account = ?`,
[
trans.imported_id || null,
db.toDateRepr(monthUtils.subDays(trans.date, 7)),
db.toDateRepr(monthUtils.addDays(trans.date, 7)),
trans.amount || 0,

6
upcoming-release-notes/2770.md
View File

@@ -1,6 +0,0 @@
---
category: Bugfix
authors: [ttlgeek, strazto, pmoon00]
---
Prevent transaction deduplication for imported transactions