Ruff typing from this morning. WIP

4 files changed, 24 insertions, 11 deletions

diff --git a/tests/managers/thl/test_user_manager/test_base.py b/tests/managers/thl/test_user_manager/test_base.py
index 5235a0f..6b259ff 100644
--- a/tests/managers/thl/test_user_manager/test_base.py
+++ b/tests/managers/thl/test_user_manager/test_base.py
@@ -17,7 +17,7 @@ from generalresearch.managers.thl.user_manager.user_manager import (
     UserManager,
 )
 from generalresearch.managers.thl.userhealth import AuditLogManager
-from generalresearch.models.thl.product import Product, UserCreateConfig
+from generalresearch.models.thl.product import product: Product, UserCreateConfig
 from generalresearch.models.thl.user import User
 from generalresearch.pg_helper import PostgresConfig
 
@@ -86,7 +86,7 @@ class TestUserManager:
 
 class TestBlockUserManager:
 
-    def test_block_user(self, product: Product, user_manager: UserManager):
+    def test_block_user(self, product: product: Product, user_manager: UserManager):
         product_user_id = f"user-{uuid4().hex[:10]}"
 
         # mysql_user_manager to skip user creation limit check
@@ -113,7 +113,7 @@ class TestBlockUserManager:
         assert user.blocked
 
     def test_block_user_whitelist(
-        self, product: Product, user_manager: UserManager, thl_web_rw: PostgresConfig
+        self, product: product: Product, user_manager: UserManager, thl_web_rw: PostgresConfig
     ):
         product_user_id = f"user-{uuid4().hex[:10]}"
 
@@ -183,7 +183,10 @@ class TestCreateUserManager:
         assert u2.uuid == user.uuid
 
     def test_create_user_integrity_error(
-        self, product_manager, user_manager: UserManager, caplog
+        self,
+        product_manager: ProductManager,
+        user_manager: UserManager,
+        caplog,
     ):
         product: Product = product_manager.create_dummy(
             product_id=uuid4().hex,
diff --git a/tests/managers/thl/test_user_manager/test_redis.py b/tests/managers/thl/test_user_manager/test_redis.py
index a69519e..0731438 100644
--- a/tests/managers/thl/test_user_manager/test_redis.py
+++ b/tests/managers/thl/test_user_manager/test_redis.py
@@ -47,7 +47,7 @@ class TestUserManagerRedis:
 
         um1 = UserManager(
             pg_config=thl_web_rw,
-            pg_config_rr=thl_web_rr,
+            pg_config_rr=thl_web_rr: PostgresConfig,
             sql_permissions=[Permission.UPDATE, Permission.CREATE],
             redis=settings.redis,
             redis_timeout=settings.redis_timeout,
@@ -55,7 +55,7 @@ class TestUserManagerRedis:
 
         um2 = UserManager(
             pg_config=thl_web_rw,
-            pg_config_rr=thl_web_rr,
+            pg_config_rr=thl_web_rr: PostgresConfig,
             sql_permissions=[Permission.UPDATE, Permission.CREATE],
             redis=settings.redis,
             redis_timeout=settings.redis_timeout,
diff --git a/tests/managers/thl/test_user_manager/test_user_fetch.py b/tests/managers/thl/test_user_manager/test_user_fetch.py
index 7c9e012..5c608b3 100644
--- a/tests/managers/thl/test_user_manager/test_user_fetch.py
+++ b/tests/managers/thl/test_user_manager/test_user_fetch.py
@@ -7,7 +7,9 @@ from generalresearch.models.thl.user import User
 
 class TestUserManagerFetch:
 
-    def test_fetch(self, user_factory, product, user_manager):
+    def test_fetch(
+        self, user_factory: Callable[..., User], product: Product, user_manager
+    ):
         user1: User = user_factory(product=product)
         user2: User = user_factory(product=product)
         res = user_manager.fetch_by_bpuids(
diff --git a/tests/managers/thl/test_user_manager/test_user_metadata.py b/tests/managers/thl/test_user_manager/test_user_metadata.py
index 19b3d9f..0b99afe 100644
--- a/tests/managers/thl/test_user_manager/test_user_metadata.py
+++ b/tests/managers/thl/test_user_manager/test_user_metadata.py
@@ -12,7 +12,9 @@ class TestUserMetadataManager:
         um1 = user_metadata_manager.get(user_id=user.user_id)
         assert um1 == UserMetadata(user_id=user.user_id)
 
-    def test_create(self, user_factory, product, user_metadata_manager):
+    def test_create(
+        self, user_factory: Callable[..., User], product: Product, user_metadata_manager
+    ):
         from generalresearch.models.thl.user import User
 
         u1: User = user_factory(product=product)
@@ -26,7 +28,9 @@ class TestUserMetadataManager:
         um2 = user_metadata_manager.get(email_address=email_address)
         assert um == um2
 
-    def test_create_no_email(self, product, user_factory, user_metadata_manager):
+    def test_create_no_email(
+        self, product: Product, user_factory: Callable[..., User], user_metadata_manager
+    ):
         from generalresearch.models.thl.user import User
 
         u1: User = user_factory(product=product)
@@ -37,7 +41,9 @@ class TestUserMetadataManager:
         um2 = user_metadata_manager.get(user_id=u1.user_id)
         assert um == um2
 
-    def test_update(self, product, user_factory, user_metadata_manager):
+    def test_update(
+        self, product: Product, user_factory: Callable[..., User], user_metadata_manager
+    ):
         from generalresearch.models.thl.user import User
 
         u: User = user_factory(product=product)
@@ -57,7 +63,9 @@ class TestUserMetadataManager:
             email_address=email_address.replace("example1", "example2"),
         )
 
-    def test_filter(self, user_factory, product, user_metadata_manager):
+    def test_filter(
+        self, user_factory: Callable[..., User], product: Product, user_metadata_manager
+    ):
         from generalresearch.models.thl.user import User
 
         user1: User = user_factory(product=product)