Ruff morning!

1 files changed, 31 insertions, 20 deletions

diff --git a/tests/managers/thl/test_session_manager.py b/tests/managers/thl/test_session_manager.py
index 6c5f820..05a49c1 100644
--- a/tests/managers/thl/test_session_manager.py
+++ b/tests/managers/thl/test_session_manager.py
@@ -1,22 +1,34 @@
-from datetime import timedelta
+from __future__ import annotations
+
+from collections.abc import Callable
+from datetime import datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
 from faker import Faker
 
+from generalresearch.managers.thl.session import SessionManager
 from generalresearch.models 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.definitions import (
     SessionStatusCode2,
     Status,
     StatusCode1,
 )
+from generalresearch.models.thl.product import Product
+from generalresearch.models.thl.session import Session
+from generalresearch.models.thl.user import User
+from generalresearch.pg_helper import PostgresConfig
 
 fake = Faker()
 
 
 class TestSessionManager:
-    def test_create_session(self, session_manager, user, utc_hour_ago):
+    def test_create_session(
+        self, session_manager: SessionManager, user: User, utc_hour_ago: datetime
+    ):
         bucket = Bucket(
             loi_min=timedelta(seconds=60),
             loi_max=timedelta(seconds=120),
@@ -39,7 +51,9 @@ class TestSessionManager:
         s2 = session_manager.get_from_uuid(session_uuid=s1.uuid)
         assert s1 == s2
 
-    def test_finish_with_status(self, session_manager, user, utc_hour_ago):
+    def test_finish_with_status(
+        self, session_manager: SessionManager, user: User, utc_hour_ago: datetime
+    ):
         uuid_1 = uuid4().hex
         session = session_manager.create(
             started=utc_hour_ago, user=user, uuid_id=uuid_1
@@ -59,7 +73,7 @@ class TestSessionManager:
 
 class TestSessionManagerFilter:
 
-    def test_base(self, session_manager, user, utc_now):
+    def test_base(self, session_manager: SessionManager, user: User, utc_now: datetime):
         uuid_id = uuid4().hex
         session_manager.create(started=utc_now, user=user, uuid_id=uuid_id)
         res = session_manager.filter(limit=1)
@@ -67,7 +81,9 @@ class TestSessionManagerFilter:
         assert isinstance(res, list)
         assert res[0].uuid == uuid_id
 
-    def test_user(self, session_manager, user, utc_hour_ago):
+    def test_user(
+        self, session_manager: SessionManager, user: User, utc_hour_ago: datetime
+    ):
         session_manager.create(started=utc_hour_ago, user=user, uuid_id=uuid4().hex)
         session_manager.create(started=utc_hour_ago, user=user, uuid_id=uuid4().hex)
 
@@ -78,16 +94,13 @@ class TestSessionManagerFilter:
         self,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
-        session_manager,
-        user,
-        utc_hour_ago,
+        session_manager: SessionManager,
+        utc_hour_ago: datetime,
     ):
-        from generalresearch.models.thl.session import Session
-        from generalresearch.models.thl.user import User
 
         p1 = product_factory()
 
-        for n in range(5):
+        for _ in range(5):
             u = user_factory(product=p1)
             session_manager.create(started=utc_hour_ago, user=u, uuid_id=uuid4().hex)
 
@@ -102,15 +115,14 @@ class TestSessionManagerFilter:
         self,
         product_factory: Callable[..., Product],
         user_factory: Callable[..., User],
-        team,
-        session_manager,
-        user,
-        utc_hour_ago,
+        team: Team,
+        session_manager: SessionManager,
+        utc_hour_ago: datetime,
         thl_web_rr: PostgresConfig,
     ):
         p1 = product_factory(team=team)
 
-        for n in range(5):
+        for _ in range(5):
             u = user_factory(product=p1)
             session_manager.create(started=utc_hour_ago, user=u, uuid_id=uuid4().hex)
 
@@ -124,14 +136,13 @@ class TestSessionManagerFilter:
         product_factory: Callable[..., Product],
         business: Business,
         user_factory: Callable[..., User],
-        session_manager,
-        user,
-        utc_hour_ago,
+        session_manager: SessionManager,
+        utc_hour_ago: datetime,
         thl_web_rr: PostgresConfig,
     ):
         p1 = product_factory(business=business)
 
-        for n in range(5):
+        for _ in range(5):
             u = user_factory(product=p1)
             session_manager.create(started=utc_hour_ago, user=u, uuid_id=uuid4().hex)