Merge branch 'master' into dev-greg

1 files changed, 110 insertions, 59 deletions

diff --git a/tests/managers/thl/test_task_status.py b/tests/managers/thl/test_task_status.py
index 55c89c0..11edc99 100644
--- a/tests/managers/thl/test_task_status.py
+++ b/tests/managers/thl/test_task_status.py
@@ -1,47 +1,61 @@
-import pytest
-from datetime import datetime, timezone, timedelta
+from __future__ import annotations
+
+from collections.abc import Callable
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
+from typing import TYPE_CHECKING
+
+import pytest
 
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     Status,
-    WallAdjustedStatus,
     StatusCode1,
+    WallAdjustedStatus,
 )
 from generalresearch.models.thl.product import (
     PayoutConfig,
-    UserWalletConfig,
     PayoutTransformation,
     PayoutTransformationPercentArgs,
+    UserWalletConfig,
 )
-from generalresearch.models.thl.session import Session, WallOut
+from generalresearch.models.thl.session import WallOut
 from generalresearch.models.thl.task_status import TaskStatusResponse
-from generalresearch.models.thl.user import User
 
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.session import Session
+    from generalresearch.models.thl.user import User
 
-start1 = datetime(2023, 2, 1, tzinfo=timezone.utc)
+start1 = datetime(2023, 2, 1, tzinfo=UTC)
 finish1 = start1 + timedelta(minutes=5)
 recon1 = start1 + timedelta(days=20)
-start2 = datetime(2023, 2, 2, tzinfo=timezone.utc)
+start2 = datetime(2023, 2, 2, tzinfo=UTC)
 finish2 = start2 + timedelta(minutes=5)
-start3 = datetime(2023, 2, 3, tzinfo=timezone.utc)
+start3 = datetime(2023, 2, 3, tzinfo=UTC)
 finish3 = start3 + timedelta(minutes=5)
 
 
-@pytest.fixture(scope="session")
-def bp1(product_manager):
+@pytest.fixture()
+def bp1(
+    product_factory: Callable[..., Product], product_manager: ProductManager
+) -> Product:
     # user wallet disabled, payout xform NULL
-    return product_manager.create_dummy(
+    return product_factory(
         user_wallet_config=UserWalletConfig(enabled=False),
         payout_config=PayoutConfig(),
     )
 
 
-@pytest.fixture(scope="session")
-def bp2(product_manager):
+@pytest.fixture()
+def bp2(
+    product_factory: Callable[..., Product], product_manager: ProductManager
+) -> Product:
     # user wallet disabled, payout xform 40%
-    return product_manager.create_dummy(
+    return product_factory(
         user_wallet_config=UserWalletConfig(enabled=False),
         payout_config=PayoutConfig(
             payout_transformation=PayoutTransformation(
@@ -52,10 +66,12 @@ def bp2(product_manager):
     )
 
 
-@pytest.fixture(scope="session")
-def bp3(product_manager):
+@pytest.fixture()
+def bp3(
+    product_factory: Callable[..., Product], product_manager: ProductManager
+) -> Product:
     # user wallet enabled, payout xform 50%
-    return product_manager.create_dummy(
+    return product_factory(
         user_wallet_config=UserWalletConfig(enabled=True),
         payout_config=PayoutConfig(
             payout_transformation=PayoutTransformation(
@@ -70,9 +86,9 @@ class TestTaskStatus:
 
     def test_task_status_complete_1(
         self,
-        bp1,
-        user_factory,
-        finished_session_factory,
+        bp1: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
         session_manager: SessionManager,
     ):
         # User Payout xform NULL
@@ -130,7 +146,11 @@ class TestTaskStatus:
         assert tsr == expected_tsr
 
     def test_task_status_complete_2(
-        self, bp2, user_factory, finished_session_factory, session_manager
+        self,
+        bp2: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        session_manager: SessionManager,
     ):
         # User Payout xform 40%
         user2: User = user_factory(product=bp2)
@@ -197,7 +217,11 @@ class TestTaskStatus:
         assert tsr == expected_tsr
 
     def test_task_status_complete_3(
-        self, bp3, user_factory, finished_session_factory, session_manager
+        self,
+        bp3: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        session_manager: SessionManager,
     ):
         # Wallet enabled User Payout xform 50% (the response is identical
         # to the user wallet disabled w same xform)
@@ -227,12 +251,17 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s3.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_fail(
-        self, bp1, user_factory, finished_session_factory, session_manager
+        self,
+        bp1: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        session_manager: SessionManager,
     ):
         # User Payout xform NULL: user payout is None always
         user1: User = user_factory(product=bp1)
@@ -263,12 +292,17 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s1.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_fail_xform(
-        self, bp2, user_factory, finished_session_factory, session_manager
+        self,
+        bp2: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        session_manager: SessionManager,
     ):
         # User Payout xform 40%: user_payout is 0 (not None)
 
@@ -298,12 +332,17 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_abandon(
-        self, bp1, user_factory, session_factory, session_manager
+        self,
+        bp1: Product,
+        user_factory: Callable[..., User],
+        session_factory: Callable[..., Session],
+        session_manager: SessionManager,
     ):
         # User Payout xform NULL: all payout fields are None
         user: User = user_factory(product=bp1)
@@ -332,12 +371,17 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_abandon_xform(
-        self, bp2, user_factory, session_factory, session_manager
+        self,
+        bp2: Product,
+        user_factory: Callable[..., User],
+        session_factory: Callable[..., Session],
+        session_manager: SessionManager,
     ):
         # User Payout xform 40%: all payout fields are None (same as when payout xform is null)
         user: User = user_factory(product=bp2)
@@ -369,17 +413,18 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_adj_fail(
         self,
-        bp1,
-        user_factory,
-        finished_session_factory,
-        wall_manager,
-        session_manager,
+        bp1: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        wall_manager: WallManager,
+        session_manager: SessionManager,
     ):
         # Complete -> Fail
         # User Payout xform NULL: adjusted_user_* and user_* is still all None
@@ -418,17 +463,18 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_adj_fail_xform(
         self,
-        bp2,
-        user_factory,
-        finished_session_factory,
-        wall_manager,
-        session_manager,
+        bp2: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        wall_manager: WallManager,
+        session_manager: SessionManager,
     ):
         # Complete -> Fail
         # User Payout xform 40%: adjusted_user_payout is 0 (not null)
@@ -470,17 +516,18 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_adj_complete_from_abandon(
         self,
-        bp1,
-        user_factory,
-        session_factory,
-        wall_manager,
-        session_manager,
+        bp1: Product,
+        user_factory: Callable[..., User],
+        session_factory: Callable[..., Session],
+        wall_manager: WallManager,
+        session_manager: SessionManager,
     ):
         # User Payout xform NULL
         user: User = user_factory(product=bp1)
@@ -524,17 +571,18 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_adj_complete_from_abandon_xform(
         self,
-        bp2,
-        user_factory,
-        session_factory,
-        wall_manager,
-        session_manager,
+        bp2: Product,
+        user_factory: Callable[..., User],
+        session_factory: Callable[..., Session],
+        wall_manager: WallManager,
+        session_manager: SessionManager,
     ):
         # User Payout xform 40%
         user: User = user_factory(product=bp2)
@@ -581,17 +629,18 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_adj_complete_from_fail(
         self,
-        bp1,
-        user_factory,
-        finished_session_factory,
-        wall_manager,
-        session_manager,
+        bp1: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        wall_manager: WallManager,
+        session_manager: SessionManager,
     ):
         # User Payout xform NULL
         user: User = user_factory(product=bp1)
@@ -635,17 +684,18 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr
 
     def test_task_status_adj_complete_from_fail_xform(
         self,
-        bp2,
-        user_factory,
-        finished_session_factory,
-        wall_manager,
-        session_manager,
+        bp2: Product,
+        user_factory: Callable[..., User],
+        finished_session_factory: Callable[..., Session],
+        wall_manager: WallManager,
+        session_manager: SessionManager,
     ):
         # User Payout xform 40%
         user: User = user_factory(product=bp2)
@@ -691,6 +741,7 @@ class TestTaskStatus:
             }
         )
         tsr = session_manager.get_task_status_response(s.uuid)
+        assert isinstance(tsr, TaskStatusResponse)
         # Not bothering with wall events ...
         tsr.wall_events = None
         assert tsr == expected_tsr