fix gr_business_bank_account fixture. fix some more tests

2 files changed, 13 insertions, 16 deletions

diff --git a/test_utils/models/gr/conftest.py b/test_utils/models/gr/conftest.py
index a48656b..859aaa4 100644
--- a/test_utils/models/gr/conftest.py
+++ b/test_utils/models/gr/conftest.py
@@ -10,9 +10,10 @@ from pydantic import PositiveInt
 from pydantic_extra_types.phone_numbers import PhoneNumber
 
 from generalresearch.models.custom_types import UUIDStr
+from generalresearch.models.gr.definitions import TransferMethod
 
 if TYPE_CHECKING:
-    from generalresearch.managers.gr.authentication import GRUserManager
+    from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
     from generalresearch.managers.gr.business import (
         BusinessAddressManager,
         BusinessBankAccountManager,
@@ -25,7 +26,6 @@ if TYPE_CHECKING:
         BusinessAddress,
         BusinessBankAccount,
     )
-    from generalresearch.models.gr.definitions import TransferMethod
     from generalresearch.models.gr.team import Membership, Team
     from generalresearch.pg_helper import PostgresConfig
     from generalresearch.redis_helper import RedisConfig
@@ -74,15 +74,11 @@ def gr_business_bank_account_factory(
 
 
 @pytest.fixture
-def gr_business_bank_account(gr_business_factory: Callable[..., Business]) -> Business:
-    return gr_business_factory(save=True)
-
-
-@pytest.fixture
-def unsaved_gr_business_bank_account(
-    gr_business_factory: Callable[..., Business],
-) -> Business:
-    return gr_business_factory(save=False)
+def gr_business_bank_account(
+    gr_business_bank_account_factory: Callable[..., BusinessBankAccount],
+    gr_business: Business,
+) -> BusinessBankAccount:
+    return gr_business_bank_account_factory(save=True, business_id=gr_business.id)
 
 
 # --- Business Address ---
@@ -277,7 +273,7 @@ def unsaved_gr_user(
 
 @pytest.fixture
 def gr_user_token_factory(
-    gr_user: GRUser, gr_user_token_manager: GRUser, gr_db: PostgresConfig
+    gr_user: GRUser, gr_token_manager: GRTokenManager, gr_db: PostgresConfig
 ) -> Callable[..., GRToken]:
 
     def _inner(
@@ -285,7 +281,8 @@ def gr_user_token_factory(
     ) -> GRToken:
 
         if save:
-            gr_user_token_manager.create(user_id=gr_user.id)
+            assert gr_user.id
+            gr_token_manager.create(user_id=gr_user.id)
             gr_user.prefetch_token(pg_config=gr_db)
 
             res = gr_user.token
diff --git a/tests/models/gr/test_authentication.py b/tests/models/gr/test_authentication.py
index 881571c..7ff44d0 100644
--- a/tests/models/gr/test_authentication.py
+++ b/tests/models/gr/test_authentication.py
@@ -67,7 +67,7 @@ class TestGRUser:
         gr_db: PostgresConfig,
     ):
         product_factory(team=gr_team)
-        gr_membership_factory(team=gr_team, gr_user=gr_user)
+        gr_membership_factory(gr_team=gr_team, gr_user=gr_user)
 
         gr_user.prefetch_teams(
             pg_config=gr_db,
@@ -127,7 +127,7 @@ class TestGRUserMethods:
         gr_membership_factory: Callable[..., Membership],
     ):
         product_factory(team=gr_team, business=gr_business)
-        gr_membership_factory(team=gr_team, gr_user=gr_user)
+        gr_membership_factory(gr_team=gr_team, gr_user=gr_user)
 
         res = gr_user.to_redis()
         assert isinstance(res, str)
@@ -177,7 +177,7 @@ class TestGRUserMethods:
         client = gr_redis_config.create_redis_client()
 
         p1 = product_factory(team=gr_team)
-        gr_membership_factory(team=gr_team, gr_user=gr_user)
+        gr_membership_factory(gr_team=gr_team, gr_user=gr_user)
 
         gr_user.set_cache(
             pg_config=gr_db, thl_web_rr=thl_web_rr, redis_config=gr_redis_config