3 files changed, 19 insertions, 77 deletions
diff --git a/test_utils/managers/conftest.py b/test_utils/managers/conftest.py
index ed771c7..ff088c2 100644
--- a/test_utils/managers/conftest.py
+++ b/test_utils/managers/conftest.py
@@ -14,15 +14,6 @@ from generalresearch.managers.thl.user_streak import (
 from generalresearch.models.definitions import Source
 
 if TYPE_CHECKING:
-    from generalresearch.managers.gr.business import (
-        BusinessAddressManager,
-        BusinessBankAccountManager,
-        BusinessManager,
-    )
-    from generalresearch.managers.gr.team import (
-        MembershipManager,
-        TeamManager,
-    )
     from generalresearch.managers.spectrum.survey import SpectrumSurveyManager
     from generalresearch.managers.thl.buyer import BuyerManager
     from generalresearch.managers.thl.ipinfo import (
@@ -35,6 +26,7 @@ if TYPE_CHECKING:
         IPRecordManager,
         UserIpHistoryManager,
     )
+    from generalresearch.models.thl.user import User
     from generalresearch.models.thl.wallet.cashout_method import CashoutMethod
     from generalresearch.pg_helper import PostgresConfig
     from generalresearch.redis_helper import RedisConfig
@@ -100,7 +92,7 @@ def user_iphistory_manager(
 
 
 @pytest.fixture(scope="function")
-def user_iphistory_manager_clear_cache(user_iphistory_manager, user):
+def user_iphistory_manager_clear_cache(user_iphistory_manager, user: User):
     # On successive py-test/jenkins runs, the cache may contain
     #   the previous run's info (keyed under the same user_id)
     user_iphistory_manager.delete_user_ip_history_cache(user_id=user.user_id)
@@ -205,69 +197,6 @@ def spectrum_survey_manager(spectrum_rw: SqlHelper) -> SpectrumSurveyManager:
     return SpectrumSurveyManager(sql_helper=spectrum_rw)
 
 
-# === GR ===
-@pytest.fixture(scope="session")
-def business_manager(
-    gr_db: PostgresConfig, gr_redis_config: RedisConfig
-) -> BusinessManager:
-    from generalresearch.redis_helper import RedisConfig
-
-    assert gr_db.dsn.path
-    assert "/unittest-" in gr_db.dsn.path
-    assert isinstance(gr_redis_config, RedisConfig)
-
-    from generalresearch.managers.gr.business import BusinessManager
-
-    return BusinessManager(
-        pg_config=gr_db,
-        redis_config=gr_redis_config,
-    )
-
-
-@pytest.fixture(scope="session")
-def business_address_manager(gr_db: PostgresConfig) -> BusinessAddressManager:
-    assert gr_db.dsn.path
-    assert "/unittest-" in gr_db.dsn.path
-
-    from generalresearch.managers.gr.business import BusinessAddressManager
-
-    return BusinessAddressManager(pg_config=gr_db)
-
-
-@pytest.fixture(scope="session")
-def business_bank_account_manager(
-    gr_db: PostgresConfig,
-) -> BusinessBankAccountManager:
-    assert gr_db.dsn.path
-    assert "/unittest-" in gr_db.dsn.path
-
-    from generalresearch.managers.gr.business import (
-        BusinessBankAccountManager,
-    )
-
-    return BusinessBankAccountManager(pg_config=gr_db)
-
-
-@pytest.fixture(scope="session")
-def team_manager(gr_db: PostgresConfig, gr_redis_config: RedisConfig) -> TeamManager:
-    assert gr_db.dsn.path
-    assert "/unittest-" in gr_db.dsn.path
-
-    from generalresearch.managers.gr.team import TeamManager
-
-    return TeamManager(pg_config=gr_db, redis_config=gr_redis_config)
-
-
-@pytest.fixture(scope="session")
-def membership_manager(gr_db: PostgresConfig) -> MembershipManager:
-    assert gr_db.dsn.path
-    assert "/unittest-" in gr_db.dsn.path
-
-    from generalresearch.managers.gr.team import MembershipManager
-
-    return MembershipManager(pg_config=gr_db)
-
-
 @pytest.fixture(scope="session")
 def delete_buyers_surveys(
     thl_web_rw: PostgresConfig, buyer_manager: BuyerManager
diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index 6e19bef..18a31e2 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -184,7 +184,10 @@ def product_manager(thl_web_rw: PostgresConfig) -> ProductManager:
 
 @pytest.fixture(scope="session")
 def user_manager(
-    settings: GRLBaseSettings, thl_web_rw: PostgresConfig, thl_web_rr: PostgresConfig
+    settings: GRLBaseSettings,
+    thl_web_rw: PostgresConfig,
+    thl_web_rr: PostgresConfig,
+    thl_redis_config: RedisConfig,
 ) -> UserManager:
     assert thl_web_rw.dsn
     assert thl_web_rw.dsn.path
@@ -193,16 +196,22 @@ def user_manager(
     assert "/unittest-" in thl_web_rw.dsn.path
     assert "/unittest-" in thl_web_rr.dsn.path
 
+    from generalresearch.managers.thl.user_manager.rate_limit import UserManagerLimiter
     from generalresearch.managers.thl.user_manager.user_manager import (
         UserManager,
     )
 
-    return UserManager(
+    um = UserManager(
         pg_config=thl_web_rw,
         pg_config_rr=thl_web_rr,
         redis=settings.redis,
     )
 
+    # rc = thl_redis_config.create_redis_client()
+    um.user_manager_limiter = UserManagerLimiter(redis=thl_redis_config.dsn)
+
+    return um
+
 
 @pytest.fixture(scope="session")
 def mysql_user_manager(thl_web_rw: PostgresConfig) -> MysqlUserManager:
diff --git a/test_utils/models/thl/conftest.py b/test_utils/models/thl/conftest.py
index badd87c..5826f0d 100644
--- a/test_utils/models/thl/conftest.py
+++ b/test_utils/models/thl/conftest.py
@@ -39,6 +39,7 @@ if TYPE_CHECKING:
     from generalresearch.managers.thl.userhealth import AuditLogManager, IPRecordManager
     from generalresearch.managers.thl.wall import WallManager
     from generalresearch.models.definitions import DeviceType
+    from generalresearch.models.gr.business import Business
     from generalresearch.models.gr.team import Team
     from generalresearch.models.legacy.bucket import Bucket
     from generalresearch.models.thl.ipinfo import IPGeoname, IPInformation
@@ -154,8 +155,7 @@ def product_factory(product_manager: ProductManager) -> Callable[..., Product]:
     def _inner(
         save: bool = True,
         team: Team | None = None,
-        # business: Business | None = None,
-        # commission_pct: Decimal = Decimal("0.05"),
+        business: Business | None = None,
         product_id: UUIDStr | None = None,
         business_id: UUIDStr | None = None,
         name: str | None = None,
@@ -171,8 +171,12 @@ def product_factory(product_manager: ProductManager) -> Callable[..., Product]:
         user_health_config: UserHealthConfig | None = None,
     ) -> Product:
         """To be used in tests, where we don't care about certain fields"""
+
         product_id = product_id if product_id else uuid4().hex
+
         team_id = team.uuid if team else uuid4().hex
+        business_id = business.uuid if business else uuid4().hex
+
         name = name if name else f"name-{product_id[:12]}"
         redirect_url = redirect_url if redirect_url else "https://www.example.com/"