wip

Author: mxr

manager_for_ynab/add_transaction/__init__.py

@@ -138,12 +138,12 @@ async def run(
             date=args.date,
             cleared=args.cleared,
             amount=args.amount,
+            quiet=args.quiet,
             db=args.sqlite_export_for_ynab_db,
             full_refresh=args.sqlite_export_for_ynab_full_refresh,
             token=token,
-            quiet=args.quiet,
         )
-        return await build_transaction_and_move_funds(
+        return await add_transaction_and_move_funds(
             resolved=resolved,
             token=token,
             db=args.sqlite_export_for_ynab_db,
@@ -155,51 +155,6 @@ async def run(
         return 1
 
 
-async def add_transaction(
-    *,
-    plan_name: str | None,
-    account_name: str | None,
-    payee_name: str | None,
-    category_name: str | None,
-    date: datetime.date | None,
-    cleared: TransactionClearedStatus | None,
-    amount: Decimal | None,
-    for_real: bool,
-    quiet: bool,
-    db: Path,
-    full_refresh: bool,
-    token_override: str | None,
-) -> int:
-    token = resolve_token(token_override)
-    try:
-        resolved = await sync_and_resolve_transaction(
-            plan_name=plan_name,
-            account_name=account_name,
-            payee_name=payee_name,
-            category_name=category_name,
-            date=date,
-            cleared=cleared,
-            amount=amount,
-            db=db,
-            full_refresh=full_refresh,
-            token=token,
-            quiet=quiet,
-        )
-        return await build_transaction_and_move_funds(
-            resolved=resolved,
-            token=token,
-            db=db,
-            for_real=for_real,
-            quiet=quiet,
-        )
-    except RuntimeError as err:
-        print(err)
-        return 1
-    except ValueError as err:
-        print(err)
-        return 1
-
-
 async def sync_and_resolve_transaction(
     *,
     plan_name: str | None,
@@ -234,7 +189,7 @@ async def sync_and_resolve_transaction(
         )
 
 
-async def build_transaction_and_move_funds(
+async def add_transaction_and_move_funds(
     *,
     resolved: ResolvedTransaction,
     token: str,
@@ -759,9 +714,8 @@ def edit_distance(left: str, right: str) -> int:
 
 
 __all__ = [
-    add_transaction.__name__,
     build_parser.__name__,
-    build_transaction_and_move_funds.__name__,
+    add_transaction_and_move_funds.__name__,
     ResolvedAccount.__name__,
     ResolvedCategory.__name__,
     ResolvedPayee.__name__,

tests/add_transaction/test.py

@@ -22,7 +22,6 @@
 from manager_for_ynab.add_transaction import _resolve_credit_card_payment_category
 from manager_for_ynab.add_transaction import _resolve_payee
 from manager_for_ynab.add_transaction import _resolve_transaction
-from manager_for_ynab.add_transaction import add_transaction
 from manager_for_ynab.add_transaction import amount_prompt
 from manager_for_ynab.add_transaction import build_parser
 from manager_for_ynab.add_transaction import confirm
@@ -223,7 +222,7 @@ async def test_add_transaction_moves_credit_card_payment_back_to_ready_to_assign
 
 
 @patch(
-    "manager_for_ynab.add_transaction.build_transaction_and_move_funds",
+    "manager_for_ynab.add_transaction.add_transaction_and_move_funds",
     new_callable=AsyncMock,
 )
 @patch(
@@ -235,11 +234,11 @@ async def test_add_transaction_moves_credit_card_payment_back_to_ready_to_assign
 async def test_run_delegates_parsed_args(
     resolve_token_mock,
     sync_and_resolve_transaction_mock,
-    build_transaction_and_move_funds_mock,
+    add_transaction_and_move_funds_mock,
 ):
     resolve_token_mock.return_value = "resolved-token"
     sync_and_resolve_transaction_mock.return_value = object()
-    build_transaction_and_move_funds_mock.return_value = 17
+    add_transaction_and_move_funds_mock.return_value = 17
 
     ret = await run(
         (
@@ -281,8 +280,8 @@ async def test_run_delegates_parsed_args(
     assert kwargs["token"] == "resolved-token"
     assert kwargs["quiet"] is True
 
-    build_transaction_and_move_funds_mock.assert_awaited_once()
-    kwargs = build_transaction_and_move_funds_mock.await_args.kwargs
+    add_transaction_and_move_funds_mock.assert_awaited_once()
+    kwargs = add_transaction_and_move_funds_mock.await_args.kwargs
     assert kwargs["resolved"] is sync_and_resolve_transaction_mock.return_value
     assert kwargs["token"] == "resolved-token"
     assert kwargs["db"] == Path("/tmp/db.sqlite")
@@ -700,7 +699,7 @@ async def test_add_transaction_returns_one_when_api_raises(
 @patch("manager_for_ynab.add_transaction.ynab.ApiClient")
 @patch("manager_for_ynab.add_transaction.ynab.Configuration")
 @pytest.mark.asyncio
-async def test_build_transaction_and_move_funds_returns_one_when_funding_fails(
+async def test_add_transaction_and_move_funds_returns_one_when_funding_fails(
     configuration_cls,
     api_client_cls,
     transactions_api_cls,
@@ -712,7 +711,7 @@ async def test_build_transaction_and_move_funds_returns_one_when_funding_fails(
 ):
     fund_category_mock.side_effect = err
 
-    ret = await add_transaction_module.build_transaction_and_move_funds(
+    ret = await add_transaction_module.add_transaction_and_move_funds(
         resolved=resolved_dining_transaction,
         token="token",
         db=tmp_path / "add-transaction.sqlite",