From 9e6f1a333a909143a4cdda08aa77f7ed60e19874 Mon Sep 17 00:00:00 2001 From: David Martos Date: Sat, 5 Oct 2024 00:07:51 +0200 Subject: [PATCH 1/3] Fix rules not checking "category is nothing" when reconciling --- packages/loot-core/src/server/accounts/sync.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.ts index 9209026d262..fae295dc5ac 100644 --- a/packages/loot-core/src/server/accounts/sync.ts +++ b/packages/loot-core/src/server/accounts/sync.ts @@ -238,6 +238,8 @@ async function normalizeTransactions( trans.account = acctId; trans.payee = await resolvePayee(trans, payee_name, payeesToCreate); + trans.category = trans.category || null; + normalized.push({ payee_name, subtransactions: subtransactions @@ -294,6 +296,7 @@ async function normalizeBankSyncTransactions(transactions, acctId) { account: trans.account, date: trans.date, notes: notes.trim().replace('#', '##'), + category: trans.category || null, imported_id: trans.transactionId, imported_payee: trans.imported_payee, cleared: trans.cleared, From 709698c47487b10cbd7629df43d76a153c5735e9 Mon Sep 17 00:00:00 2001 From: David Martos Date: Sat, 5 Oct 2024 00:19:31 +0200 Subject: [PATCH 2/3] release notes --- upcoming-release-notes/3572.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 upcoming-release-notes/3572.md diff --git a/upcoming-release-notes/3572.md b/upcoming-release-notes/3572.md new file mode 100644 index 00000000000..a96dfc64bb8 --- /dev/null +++ b/upcoming-release-notes/3572.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [davidmartos96] +--- + +Fix rules not checking "category is nothing" when reconciling From 9dd43423f40656e6ad5ef328a5b7dc22e5029de5 Mon Sep 17 00:00:00 2001 From: David Martos Date: Wed, 9 Oct 2024 18:56:57 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Matt Fiddaman --- packages/loot-core/src/server/accounts/sync.ts | 4 ++-- upcoming-release-notes/3572.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.ts index fae295dc5ac..b453a5b88d4 100644 --- a/packages/loot-core/src/server/accounts/sync.ts +++ b/packages/loot-core/src/server/accounts/sync.ts @@ -238,7 +238,7 @@ async function normalizeTransactions( trans.account = acctId; trans.payee = await resolvePayee(trans, payee_name, payeesToCreate); - trans.category = trans.category || null; + trans.category = trans.category ?? null; normalized.push({ payee_name, @@ -296,7 +296,7 @@ async function normalizeBankSyncTransactions(transactions, acctId) { account: trans.account, date: trans.date, notes: notes.trim().replace('#', '##'), - category: trans.category || null, + category: trans.category ?? null, imported_id: trans.transactionId, imported_payee: trans.imported_payee, cleared: trans.cleared, diff --git a/upcoming-release-notes/3572.md b/upcoming-release-notes/3572.md index a96dfc64bb8..e0802aca51f 100644 --- a/upcoming-release-notes/3572.md +++ b/upcoming-release-notes/3572.md @@ -3,4 +3,4 @@ category: Bugfix authors: [davidmartos96] --- -Fix rules not checking "category is nothing" when reconciling +Fix "category is nothing" rules not matching