update

Author: mxr

manager_for_ynab/auto_approve/__init__.py

@@ -30,7 +30,7 @@
 @dataclass(frozen=True)
 class Transaction:
     id: str
-    matched_transaction_id: str
+    matched_transaction_id: str | None
     plan_id: str
     account_name: str
     payee_name: str
@@ -96,7 +96,7 @@ async def auto_approve(
     found_txns = [txn for txns in txns_by_plan.values() for txn in txns]
     total_txns = len(found_txns)
 
-    _print(f"Found {total_txns} matched transaction(s) to approve.", quiet=quiet)
+    _print(f"Found {total_txns} transaction(s) to approve.", quiet=quiet)
     if found_txns:
         print_found_txns(found_txns, quiet=quiet)
 
@@ -139,6 +139,7 @@ def build_updates(
             ynab.SaveTransactionWithIdOrImportId(id=txn_id, approved=True)
             for txn in txns
             for txn_id in (txn.id, txn.matched_transaction_id)
+            if txn_id is not None
         )
     return grouped
 
@@ -170,7 +171,7 @@ def print_found_txns(found_txns: list[Transaction], *, quiet: bool) -> None:
     if quiet:
         return
 
-    table = Table(title="Matched Transactions To Approve")
+    table = Table(title="Transactions To Approve")
     table.add_column("Date")
     table.add_column("Account")
     table.add_column("Payee")

manager_for_ynab/auto_approve/auto_approve.sql

@@ -10,10 +10,27 @@ FROM transactions
 WHERE
     transactions.deleted = 0
     AND transactions.approved = 0
-    AND transactions.matched_transaction_id IS NOT NULL
-    -- matched pairs reference each other
-    -- so keep one stable row per pair
-    AND transactions.id < transactions.matched_transaction_id
+    AND (
+        (
+            transactions.matched_transaction_id IS NOT NULL
+            -- matched pairs reference each other
+            -- so keep one stable row per pair
+            AND transactions.id < transactions.matched_transaction_id
+        )
+        OR EXISTS (
+            SELECT 1
+            FROM scheduled_transactions
+            WHERE
+                scheduled_transactions.plan_id = transactions.plan_id
+                AND scheduled_transactions.deleted = 0
+                AND scheduled_transactions.account_name
+                = transactions.account_name
+                AND scheduled_transactions.payee_name = transactions.payee_name
+                AND scheduled_transactions.amount = transactions.amount
+                AND DATE(scheduled_transactions.date_next)
+                = DATE(transactions."date", '+1 month')
+        )
+    )
 ORDER BY
     transactions."date" ASC
     , transactions.account_name ASC

testing/seed.sql

@@ -514,6 +514,72 @@ CREATE TABLE subtransactions (
 )
 ;
 
+CREATE TABLE scheduled_transactions (
+    id TEXT PRIMARY KEY
+    , plan_id TEXT
+    , account_id TEXT
+    , account_name TEXT
+    , amount INT
+    , amount_formatted TEXT
+    , amount_currency REAL
+    , category_id TEXT
+    , category_name TEXT
+    , date_first TEXT
+    , date_next TEXT
+    , deleted BOOLEAN
+    , flag_color TEXT
+    , flag_name TEXT
+    , frequency TEXT
+    , memo TEXT
+    , payee_id TEXT
+    , payee_name TEXT
+    , transfer_account_id TEXT
+)
+;
+
+INSERT INTO scheduled_transactions (
+    id
+    , plan_id
+    , account_id
+    , account_name
+    , amount
+    , amount_formatted
+    , amount_currency
+    , category_id
+    , category_name
+    , date_first
+    , date_next
+    , deleted
+    , flag_color
+    , flag_name
+    , frequency
+    , memo
+    , payee_id
+    , payee_name
+    , transfer_account_id
+) VALUES (
+    'sched-solo'
+    , 'plan-1'
+    , NULL
+    , 'Checking'
+    , -7000
+    , '-$7.00'
+    , -7.0
+    , NULL
+    , NULL
+    , '2026-04-21'
+    , '2026-05-21'
+    , 0
+    , NULL
+    , NULL
+    , 'monthly'
+    , NULL
+    , NULL
+    , 'Solo'
+    , NULL
+)
+;
+
 INSERT INTO transactions (
     id
     , plan_id

tests/auto_approve/test.py

@@ -29,7 +29,7 @@ async def test_fetch_auto_approve_transactions_filters_expected_rows(db):
         found = await fetch_auto_approve_transactions(con)
 
     assert {plan_id: [txn.id for txn in txns] for plan_id, txns in found.items()} == {
-        "plan-1": ["pair-a-1"],
+        "plan-1": ["pair-a-1", "unmatched"],
         "plan-2": ["pair-b-1"],
     }
 
@@ -69,6 +69,28 @@ def test_build_updates_groups_by_plan_and_updates_both_ids():
     assert all(txn.approved is True for txns in updates.values() for txn in txns)
 
 
+def test_build_updates_approves_unmatched_scheduled_transactions():
+    txns_by_plan = {
+        "plan-1": [
+            Transaction(
+                id="txn-1",
+                matched_transaction_id=None,
+                plan_id="plan-1",
+                account_name="Checking",
+                payee_name="Apple",
+                amount_formatted="-$21.76",
+                date="2026-04-20",
+            )
+        ]
+    }
+
+    updates = build_updates(txns_by_plan)
+
+    assert {plan_id: [txn.id for txn in txns] for plan_id, txns in updates.items()} == {
+        "plan-1": ["txn-1"],
+    }
+
+
 @patch.dict("os.environ", {_ENV_TOKEN: ""})
 @pytest.mark.asyncio
 async def test_run_requires_token(db):
@@ -105,6 +127,15 @@ def _expected_auto_approve_result(updated_count: int) -> AutoApproveResult:
                 amount_formatted="-$4.50",
                 date="2026-04-20",
             ),
+            Transaction(
+                id="unmatched",
+                matched_transaction_id=None,
+                plan_id="plan-1",
+                account_name="Checking",
+                payee_name="Solo",
+                amount_formatted="-$7.00",
+                date="2026-04-21",
+            ),
             Transaction(
                 id="pair-b-1",
                 matched_transaction_id="pair-b-2",
@@ -177,9 +208,13 @@ async def test_auto_approve_for_real_returns_updated_count(
     ynab_api_client.assert_called_once_with(ynab_configuration.return_value)
     sync.assert_called_once_with("token", db, False, quiet=True)
     assert [plan_id for plan_id, _ in updates] == ["plan-1", "plan-2"]
-    assert [txn.id for txn in updates[0][1].transactions] == ["pair-a-1", "pair-a-2"]
+    assert [txn.id for txn in updates[0][1].transactions] == [
+        "pair-a-1",
+        "pair-a-2",
+        "unmatched",
+    ]
     assert [txn.id for txn in updates[1][1].transactions] == ["pair-b-1", "pair-b-2"]
-    assert result == _expected_auto_approve_result(2)
+    assert result == _expected_auto_approve_result(3)
 
 
 @patch.dict("os.environ", {_ENV_TOKEN: "token"})
@@ -194,7 +229,7 @@ async def test_run_dry_run_does_not_update_transactions(sync, db, capsys):
     sync.assert_called_once_with("token", db, False, quiet=False)
     assert "** Refreshing SQLite DB **" in out
     assert "** Done **" in out
-    assert "Found 2 matched transaction(s) to approve." in out
+    assert "Found 3 transaction(s) to approve." in out
     assert "Use --for-real to actually approve transactions." in out
 
 
@@ -217,7 +252,7 @@ async def test_run_quiet_suppresses_all_output(sync, db, capsys):
 async def test_run_no_matching_transactions(sync, db, capsys):
     with sqlite3.connect(db) as con:
         con.execute(
-            "UPDATE transactions SET approved = 1 WHERE matched_transaction_id IS NOT NULL"
+            "UPDATE transactions SET approved = 1 WHERE matched_transaction_id IS NOT NULL OR id = 'unmatched'"
         )
 
     ret = await run(("--sqlite-export-for-ynab-db", str(db)))
@@ -227,7 +262,7 @@ async def test_run_no_matching_transactions(sync, db, capsys):
     sync.assert_called_once_with("token", db, False, quiet=False)
     assert "** Refreshing SQLite DB **" in out
     assert "** Done **" in out
-    assert "Found 0 matched transaction(s) to approve." in out
+    assert "Found 0 transaction(s) to approve." in out
 
 
 @patch.dict("os.environ", {_ENV_TOKEN: "token"})
@@ -248,5 +283,9 @@ async def test_run_for_real_updates_transactions_grouped_by_plan(
     ynab_api_client.assert_called_once_with(ynab_configuration.return_value)
     sync.assert_called_once_with("token", db, False, quiet=False)
     assert [plan_id for plan_id, _ in updates] == ["plan-1", "plan-2"]
-    assert [txn.id for txn in updates[0][1].transactions] == ["pair-a-1", "pair-a-2"]
+    assert [txn.id for txn in updates[0][1].transactions] == [
+        "pair-a-1",
+        "pair-a-2",
+        "unmatched",
+    ]
     assert [txn.id for txn in updates[1][1].transactions] == ["pair-b-1", "pair-b-2"]