fix eval for new operations

actualbudget · Nov 26, 2024 · 0c0ea50 · 0c0ea50
1 parent 7b2d299
commit 0c0ea50
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/packages/loot-core/src/server/accounts/rules.ts b/packages/loot-core/src/server/accounts/rules.ts
@@ -522,10 +522,19 @@ export class Condition {
         }
 
       case 'onBudget':
+        if (!object._account) {
+          return false;
+        }
+
+        return object._account.offbudget === 0;
+
       case 'offBudget':
-        //both has no value, just the operation
-        return true;
-
+        if (!object._account) {
+          return false;
+        }
+
+        return object._account.offbudget === 1;
+
       default:
     }
 

diff --git a/packages/loot-core/src/server/accounts/transaction-rules.ts b/packages/loot-core/src/server/accounts/transaction-rules.ts
@@ -16,7 +16,7 @@ import {
 } from '../../types/models';
 import { schemaConfig } from '../aql';
 import * as db from '../db';
-import { getPayee, getPayeeByName, insertPayee } from '../db';
+import { getPayee, getPayeeByName, insertPayee, getAccount } from '../db';
 import { getMappings } from '../db/mappings';
 import { RuleError } from '../errors';
 import { requiredFields, toDateRepr } from '../models';
@@ -855,6 +855,13 @@ export async function prepareTransactionForRules(
     }
   }
 
+  if (trans.account) {
+    const account = await getAccount(trans.account);
+    if (account) {
+      r._account = account;
+    }
+  }
+
   return r;
 }
 

diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
@@ -473,6 +473,10 @@ export async function getPayee(id) {
   return first(`SELECT * FROM payees WHERE id = ?`, [id]);
 }
 
+export async function getAccount(id) {
+  return first(`SELECT * FROM accounts WHERE id = ?`, [id]);
+}
+
 export async function insertPayee(payee) {
   payee = payeeModel.validate(payee);
   let id;

diff --git a/packages/loot-core/src/types/models/transaction.d.ts b/packages/loot-core/src/types/models/transaction.d.ts
@@ -26,4 +26,5 @@ export interface TransactionEntity {
   subtransactions?: TransactionEntity[];
   _unmatched?: boolean;
   _deleted?: boolean;
+  _account?: AccountEntity;
 }