Ruff morning!

3 files changed, 81 insertions, 46 deletions

diff --git a/test_utils/managers/conftest.py b/test_utils/managers/conftest.py
index 2a9ea00..e5d6015 100644
--- a/test_utils/managers/conftest.py
+++ b/test_utils/managers/conftest.py
@@ -15,11 +15,17 @@ from generalresearch.managers.gr.team import (
 )
 from generalresearch.managers.spectrum.survey import SpectrumSurveyManager
 from generalresearch.managers.thl.buyer import BuyerManager
+from generalresearch.managers.thl.cashout_method import (
+    CashoutMethodManager,
+)
 from generalresearch.managers.thl.ipinfo import (
     GeoIpInfoManager,
     IPGeonameManager,
     IPInformationManager,
 )
+from generalresearch.managers.thl.user_streak import (
+    UserStreakManager,
+)
 from generalresearch.managers.thl.userhealth import (
     AuditLogManager,
     IPRecordManager,
@@ -114,12 +120,9 @@ def geoipinfo_manager(
 
 
 @pytest.fixture(scope="session")
-def cashout_method_manager(thl_web_rw: PostgresConfig):
+def cashout_method_manager(thl_web_rw: PostgresConfig) -> CashoutMethodManager:
     assert thl_web_rw.dsn.path
     assert "/unittest-" in thl_web_rw.dsn.path
-    from generalresearch.managers.thl.cashout_method import (
-        CashoutMethodManager,
-    )
 
     return CashoutMethodManager(pg_config=thl_web_rw)
 
@@ -132,12 +135,9 @@ def event_manager(thl_redis_config: RedisConfig):
 
 
 @pytest.fixture(scope="session")
-def user_streak_manager(thl_web_rw: PostgresConfig):
+def user_streak_manager(thl_web_rw: PostgresConfig) -> UserStreakManager:
     assert thl_web_rw.dsn.path
     assert "/unittest-" in thl_web_rw.dsn.path
-    from generalresearch.managers.thl.user_streak import (
-        UserStreakManager,
-    )
 
     return UserStreakManager(pg_config=thl_web_rw)
 
@@ -169,10 +169,16 @@ def delete_cashoutmethod_db(thl_web_rw: PostgresConfig) -> Callable[..., None]:
 
 
 @pytest.fixture(scope="session")
-def setup_cashoutmethod_db(cashout_method_manager, delete_cashoutmethod_db):
-    delete_cashoutmethod_db()
-    for x in EXAMPLE_TANGO_CASHOUT_METHODS:
-        cashout_method_manager.create(x)
+def setup_cashoutmethod_db(
+    cashout_method_manager: CashoutMethodManager,
+    delete_cashoutmethod_db: Callable[..., None],
+) -> Callable[..., None]:
+
+    def _inner():
+        delete_cashoutmethod_db()
+
+        for x in EXAMPLE_TANGO_CASHOUT_METHODS:
+            cashout_method_manager.create(x)
 
     # TODO: convert these ids into instances to use.
     # settings.amt_bonus_cashout_method_id
@@ -180,7 +186,9 @@ def setup_cashoutmethod_db(cashout_method_manager, delete_cashoutmethod_db):
 
     # cashout_method_manager.create(AMT_ASSIGNMENT_CASHOUT_METHOD)
     # cashout_method_manager.create(AMT_BONUS_CASHOUT_METHOD)
-    raise NotImplementedError("Need to implement setup_cashoutmethod_db")
+    # raise NotImplementedError("Need to implement setup_cashoutmethod_db")
+
+    return _inner
 
 
 # === THL: Marketplaces ===
@@ -259,33 +267,39 @@ def membership_manager(gr_db: PostgresConfig) -> MembershipManager:
 
 
 @pytest.fixture(scope="session")
-def delete_buyers_surveys(thl_web_rw: PostgresConfig, buyer_manager: BuyerManager):
-    # assert "/unittest-" in thl_web_rw.dsn.path
-    thl_web_rw.execute_write(
-        """
-    DELETE FROM marketplace_surveystat
-    WHERE survey_id IN (
-        SELECT id
-        FROM marketplace_survey
-        WHERE source = %(source)s
-    );""",
-        params={"source": Source.TESTING.value},
-    )
-    thl_web_rw.execute_write(
-        """
-    DELETE FROM marketplace_survey
-    WHERE buyer_id IN (
-        SELECT id
-        FROM marketplace_buyer
-        WHERE source = %(source)s
-    );""",
-        params={"source": Source.TESTING.value},
-    )
-    thl_web_rw.execute_write(
-        """
-    DELETE from marketplace_buyer
-    WHERE source=%(source)s;
-    """,
-        params={"source": Source.TESTING.value},
-    )
-    buyer_manager.populate_caches()
+def delete_buyers_surveys(
+    thl_web_rw: PostgresConfig, buyer_manager: BuyerManager
+) -> Callable[..., None]:
+
+    def _inner():
+        # assert "/unittest-" in thl_web_rw.dsn.path
+        thl_web_rw.execute_write(
+            """
+        DELETE FROM marketplace_surveystat
+        WHERE survey_id IN (
+            SELECT id
+            FROM marketplace_survey
+            WHERE source = %(source)s
+        );""",
+            params={"source": Source.TESTING.value},
+        )
+        thl_web_rw.execute_write(
+            """
+        DELETE FROM marketplace_survey
+        WHERE buyer_id IN (
+            SELECT id
+            FROM marketplace_buyer
+            WHERE source = %(source)s
+        );""",
+            params={"source": Source.TESTING.value},
+        )
+        thl_web_rw.execute_write(
+            """
+        DELETE from marketplace_buyer
+        WHERE source=%(source)s;
+        """,
+            params={"source": Source.TESTING.value},
+        )
+        buyer_manager.populate_caches()
+
+    return _inner
diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index 21b2007..d40b7d2 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -20,6 +20,12 @@ from generalresearch.managers.thl.session import SessionManager
 from generalresearch.managers.thl.task_adjustment import (
     TaskAdjustmentManager,
 )
+from generalresearch.managers.thl.user_manager.mysql_user_manager import (
+    MysqlUserManager,
+)
+from generalresearch.managers.thl.user_manager.redis_user_manager import (
+    RedisUserManager,
+)
 from generalresearch.managers.thl.user_manager.user_manager import (
     UserManager,
 )
@@ -161,6 +167,16 @@ def user_manager(
 
 
 @pytest.fixture(scope="session")
+def mysql_user_manager(thl_web_rw: PostgresConfig) -> MysqlUserManager:
+    return MysqlUserManager(pg_config=thl_web_rw, is_read_replica=False)
+
+
+@pytest.fixture(scope="session")
+def redis_user_manager(thl_redis_config: RedisConfig) -> RedisUserManager:
+    return RedisUserManager(redis_dsn=thl_redis_config)
+
+
+@pytest.fixture(scope="session")
 def user_metadata_manager(thl_web_rw: PostgresConfig) -> UserMetadataManager:
     assert thl_web_rw.dsn
     assert thl_web_rw.dsn.path
diff --git a/test_utils/models/upk/conftest.py b/test_utils/models/upk/conftest.py
index c8855da..ef77dd6 100644
--- a/test_utils/models/upk/conftest.py
+++ b/test_utils/models/upk/conftest.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import os
 import time
+from collections.abc import Callable
 from typing import TYPE_CHECKING
 from uuid import UUID
 
@@ -169,9 +170,13 @@ def upk_data(
     propertymarketplaceassociation_data,
     propertyitemrange_data,
     question_data,
-) -> None:
-    # Wait a second to make sure the HarmonizerCache refresh loop pulls these in
-    time.sleep(2)
+) -> Callable[..., None]:
+
+    def _inner():
+        # Wait a second to make sure the HarmonizerCache refresh loop pulls these in
+        time.sleep(2)
+
+    return _inner
 
 
 def test_fixtures(upk_data):