Merge branch 'master' into dev-greg

1 files changed, 58 insertions, 61 deletions

diff --git a/tests/managers/thl/test_ledger/test_user_txs.py b/tests/managers/thl/test_ledger/test_user_txs.py
index ecf146f..6b6ef5b 100644
--- a/tests/managers/thl/test_ledger/test_user_txs.py
+++ b/tests/managers/thl/test_ledger/test_user_txs.py
@@ -1,54 +1,58 @@
-from datetime import datetime, timedelta, timezone
+from __future__ import annotations
+
+from collections.abc import Callable
+from datetime import UTC, datetime
 from decimal import Decimal
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.managers.thl.user_compensate import user_compensate
 from generalresearch.models.thl.definitions import (
     Status,
-    WallAdjustedStatus,
 )
 from generalresearch.models.thl.ledger import (
     TransactionType,
     UserLedgerTransactionTypesSummary,
     UserLedgerTransactionTypeSummary,
 )
+from generalresearch.models.thl.wallet.definitions import PayoutType
 
 if TYPE_CHECKING:
-    from generalresearch.config import GRLSettings
+    from generalresearch.config import GRLBaseSettings
+    from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.managers.thl.payout import UserPayoutEventManager
     from generalresearch.models.thl.product import Product
     from generalresearch.models.thl.session import Session
     from generalresearch.models.thl.user import User
-    from generalresearch.models.thl.wallet import PayoutType
 
 
 def test_user_txs(
-    user_factory: Callable[..., "User"],
-    product_amt_true: "Product",
+    user_factory: Callable[..., User],
+    product_amt_true: Product,
     create_main_accounts: Callable[..., None],
-    thl_lm: ThlLedgerManager,
-    lm,
+    thl_ledger_manager: ThlLedgerManager,
+    ledger_manager: LedgerManager,
     delete_ledger_db: Callable[..., None],
-    session_with_tx_factory,
-    adj_to_fail_with_tx_factory,
-    adj_to_complete_with_tx_factory,
-    session_factory,
-    user_payout_event_manager,
+    session_with_tx_factory: Callable[..., Session],
+    adj_to_fail_with_tx_factory: Callable[..., None],
+    adj_to_complete_with_tx_factory: Callable[..., None],
+    session_factory: Callable[..., Session],
+    user_payout_event_manager: UserPayoutEventManager,
     utc_now: datetime,
-    settings: "GRLSettings",
+    settings: GRLBaseSettings,
 ):
     delete_ledger_db()
     create_main_accounts()
 
     user: User = user_factory(product=product_amt_true)
-    account = thl_lm.get_account_or_create_user_wallet(user)
+    account = thl_ledger_manager.get_account_or_create_user_wallet(user)
     print(f"{account.uuid=}")
 
     s: Session = session_with_tx_factory(user=user, wall_req_cpi=Decimal("1.00"))
 
-    bribe_uuid = user_compensate(
-        ledger_manager=thl_lm,
+    user_compensate(
+        ledger_manager=thl_ledger_manager,
         user=user,
         amount_int=100,
     )
@@ -60,9 +64,9 @@ def test_user_txs(
         amount=5,
         created=utc_now,
         payout_type=PayoutType.AMT_HIT,
-        request_data=dict(),
+        request_data={},
     )
-    thl_lm.create_tx_user_payout_request(
+    thl_ledger_manager.create_tx_user_payout_request(
         user=user,
         payout_event=pe,
     )
@@ -73,9 +77,9 @@ def test_user_txs(
         amount=127,
         created=utc_now,
         payout_type=PayoutType.AMT_BONUS,
-        request_data=dict(),
+        request_data={},
     )
-    thl_lm.create_tx_user_payout_request(
+    thl_ledger_manager.create_tx_user_payout_request(
         user=user,
         payout_event=pe,
     )
@@ -92,16 +96,16 @@ def test_user_txs(
     )
     adj_to_complete_with_tx_factory(session=s_fail, created=utc_now)
 
-    # txs = thl_lm.get_tx_filtered_by_account(account.uuid)
+    # txs = thl_ledger_manager.get_tx_filtered_by_account(account.uuid)
     # print(len(txs), txs)
-    txs = thl_lm.get_user_txs(user)
+    txs = thl_ledger_manager.get_user_txs(user)
     assert len(txs.transactions) == 6
     assert txs.total == 6
     assert txs.page == 1
     assert txs.size == 50
 
     # print(len(txs.transactions), txs)
-    d = txs.model_dump_json()
+    # d = txs.model_dump_json()
     # print(d)
 
     descriptions = {x.description for x in txs.transactions}
@@ -136,33 +140,29 @@ def test_user_txs(
 
 
 def test_user_txs_pagination(
-    user_factory: Callable[..., "User"],
-    product_amt_true: "Product",
+    user_factory: Callable[..., User],
+    product_amt_true: Product,
     create_main_accounts: Callable[..., None],
-    thl_lm: "ThlLedgerManager",
-    lm: "LedgerManager",
+    ledger_manager: LedgerManager,
+    thl_ledger_manager: ThlLedgerManager,
     delete_ledger_db: Callable[..., None],
-    session_with_tx_factory: Callable[..., "Session"],
-    adj_to_fail_with_tx_factory,
-    user_payout_event_manager,
-    utc_now: datetime,
 ):
     delete_ledger_db()
     create_main_accounts()
 
     user: User = user_factory(product=product_amt_true)
-    account = thl_lm.get_account_or_create_user_wallet(user)
+    account = thl_ledger_manager.get_account_or_create_user_wallet(user)
     print(f"{account.uuid=}")
 
     for _ in range(12):
         user_compensate(
-            ledger_manager=thl_lm,
+            ledger_manager=thl_ledger_manager,
             user=user,
             amount_int=100,
             skip_flag_check=True,
         )
 
-    txs = thl_lm.get_user_txs(user, page=1, size=5)
+    txs = thl_ledger_manager.get_user_txs(user, page=1, size=5)
     assert len(txs.transactions) == 5
     assert txs.total == 12
     assert txs.page == 1
@@ -171,7 +171,7 @@ def test_user_txs_pagination(
     assert txs.summary.user_bonus.entry_count == 12
 
     # Skip to the 3rd page. We made 12, so there are 2 left
-    txs = thl_lm.get_user_txs(user, page=3, size=5)
+    txs = thl_ledger_manager.get_user_txs(user, page=3, size=5)
     assert len(txs.transactions) == 2
     assert txs.total == 12
     assert txs.page == 3
@@ -179,7 +179,7 @@ def test_user_txs_pagination(
     assert txs.summary.user_bonus.entry_count == 12
 
     # Should be empty, not fail
-    txs = thl_lm.get_user_txs(user, page=4, size=5)
+    txs = thl_ledger_manager.get_user_txs(user, page=4, size=5)
     assert len(txs.transactions) == 0
     assert txs.total == 12
     assert txs.page == 4
@@ -187,14 +187,14 @@ def test_user_txs_pagination(
     assert txs.summary.user_bonus.entry_count == 12
 
     # Test filtering. We should pull back only this one
-    now = datetime.now(tz=timezone.utc)
+    now = datetime.now(tz=UTC)
     user_compensate(
-        ledger_manager=thl_lm,
+        ledger_manager=thl_ledger_manager,
         user=user,
         amount_int=100,
         skip_flag_check=True,
     )
-    txs = thl_lm.get_user_txs(user, page=1, size=5, time_start=now)
+    txs = thl_ledger_manager.get_user_txs(user, page=1, size=5, time_start=now)
     assert len(txs.transactions) == 1
     assert txs.total == 1
     assert txs.page == 1
@@ -203,8 +203,8 @@ def test_user_txs_pagination(
     assert txs.summary.user_bonus.entry_count == 1
 
     # And filtering with 0 results
-    now = datetime.now(tz=timezone.utc)
-    txs = thl_lm.get_user_txs(user, page=1, size=5, time_start=now)
+    now = datetime.now(tz=UTC)
+    txs = thl_ledger_manager.get_user_txs(user, page=1, size=5, time_start=now)
     assert len(txs.transactions) == 0
     assert txs.total == 0
     assert txs.page == 1
@@ -215,16 +215,13 @@ def test_user_txs_pagination(
 
 
 def test_user_txs_rolling_balance(
-    user_factory: Callable[..., "User"],
-    product_amt_true: "Product",
-    create_main_accounts,
-    thl_lm,
-    lm,
+    user_factory: Callable[..., User],
+    product_amt_true: Product,
+    create_main_accounts: Callable[..., None],
+    thl_ledger_manager: ThlLedgerManager,
     delete_ledger_db: Callable[..., None],
-    session_with_tx_factory,
-    adj_to_fail_with_tx_factory,
-    user_payout_event_manager,
-    settings: "GRLSettings",
+    user_payout_event_manager: UserPayoutEventManager,
+    settings: GRLBaseSettings,
 ):
     """
     Creates 3 $1.00 bonuses (postive),
@@ -237,11 +234,11 @@ def test_user_txs_rolling_balance(
     create_main_accounts()
 
     user: User = user_factory(product=product_amt_true)
-    account = thl_lm.get_account_or_create_user_wallet(user)
+    account = thl_ledger_manager.get_account_or_create_user_wallet(user)
 
     for _ in range(3):
         user_compensate(
-            ledger_manager=thl_lm,
+            ledger_manager=thl_ledger_manager,
             user=user,
             amount_int=100,
             skip_flag_check=True,
@@ -253,21 +250,21 @@ def test_user_txs_rolling_balance(
         cashout_method_uuid=settings.amt_bonus_cashout_method_id,
         amount=150,
         payout_type=PayoutType.AMT_BONUS,
-        request_data=dict(),
+        request_data={},
     )
-    thl_lm.create_tx_user_payout_request(
+    thl_ledger_manager.create_tx_user_payout_request(
         user=user,
         payout_event=pe,
     )
     for _ in range(3):
         user_compensate(
-            ledger_manager=thl_lm,
+            ledger_manager=thl_ledger_manager,
             user=user,
             amount_int=100,
             skip_flag_check=True,
         )
 
-    txs = thl_lm.get_user_txs(user, page=1, size=10)
+    txs = thl_ledger_manager.get_user_txs(user, page=1, size=10)
     assert txs.transactions[0].balance_after == 100
     assert txs.transactions[1].balance_after == 200
     assert txs.transactions[2].balance_after == 300
@@ -278,7 +275,7 @@ def test_user_txs_rolling_balance(
 
     # Ascending order, get 2nd page, make sure the balances include
     # the previous txs. (will return last 3 txs)
-    txs = thl_lm.get_user_txs(user, page=2, size=4)
+    txs = thl_ledger_manager.get_user_txs(user, page=2, size=4)
     assert len(txs.transactions) == 3
     assert txs.transactions[0].balance_after == 250
     assert txs.transactions[1].balance_after == 350
@@ -286,7 +283,7 @@ def test_user_txs_rolling_balance(
 
     # Descending order, get 1st page. Will
     # return most recent 3 txs in desc order
-    txs = thl_lm.get_user_txs(user, page=1, size=3, order_by="-created")
+    txs = thl_ledger_manager.get_user_txs(user, page=1, size=3, order_by="-created")
     assert len(txs.transactions) == 3
     assert txs.transactions[0].balance_after == 450
     assert txs.transactions[1].balance_after == 350