Merge branch 'master' of ssh://code.g-r-l.com/generalresearch

3 files changed, 15 insertions, 10 deletions

diff --git a/tests/models/thl/test_contest/test_contest.py b/tests/models/thl/test_contest/test_contest.py
index d53eee5..0fbd4cc 100644
--- a/tests/models/thl/test_contest/test_contest.py
+++ b/tests/models/thl/test_contest/test_contest.py
@@ -1,4 +1,8 @@
+from typing import Callable
+
 import pytest
+
+from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 
 
@@ -11,13 +15,13 @@ class TestContest:
     """
 
     @pytest.fixture(scope="function")
-    def user_1(self, user_factory, product) -> User:
+    def user_1(self, user_factory: Callable[..., User], product: Product) -> User:
         return user_factory(product=product)
 
     @pytest.fixture(scope="function")
-    def user_2(self, user_factory, product) -> User:
+    def user_2(self, user_factory: Callable[..., User], product: Product) -> User:
         return user_factory(product=product)
 
     @pytest.fixture(scope="function")
-    def user_3(self, user_factory, product) -> User:
+    def user_3(self, user_factory: Callable[..., User], product: Product) -> User:
         return user_factory(product=product)
diff --git a/tests/models/thl/test_contest/test_leaderboard_contest.py b/tests/models/thl/test_contest/test_leaderboard_contest.py
index 98f3215..8b714ee 100644
--- a/tests/models/thl/test_contest/test_leaderboard_contest.py
+++ b/tests/models/thl/test_contest/test_leaderboard_contest.py
@@ -7,8 +7,8 @@ from generalresearch.currency import USDCent
 from generalresearch.managers.leaderboard.manager import LeaderboardManager
 from generalresearch.models.thl.contest import ContestPrize
 from generalresearch.models.thl.contest.definitions import (
-    ContestType,
     ContestPrizeKind,
+    ContestType,
 )
 from generalresearch.models.thl.contest.leaderboard import (
     LeaderboardContest,
@@ -17,6 +17,7 @@ from generalresearch.models.thl.contest.utils import (
     distribute_leaderboard_prizes,
 )
 from generalresearch.models.thl.leaderboard import LeaderboardRow
+from generalresearch.models.thl.product import Product
 from tests.models.thl.test_contest.test_contest import TestContest
 
 
@@ -24,7 +25,7 @@ class TestLeaderboardContest(TestContest):
 
     @pytest.fixture
     def leaderboard_contest(
-        self, product, thl_redis, user_manager
+        self, product: Product, thl_redis, user_manager
     ) -> "LeaderboardContest":
         board_key = f"leaderboard:{product.uuid}:us:weekly:2025-05-26:complete_count"
 
diff --git a/tests/models/thl/test_contest/test_raffle_contest.py b/tests/models/thl/test_contest/test_raffle_contest.py
index e1c0a15..d7920f0 100644
--- a/tests/models/thl/test_contest/test_raffle_contest.py
+++ b/tests/models/thl/test_contest/test_raffle_contest.py
@@ -6,26 +6,26 @@ from pytest import approx
 
 from generalresearch.currency import USDCent
 from generalresearch.models.thl.contest import (
-    ContestPrize,
     ContestEndCondition,
+    ContestPrize,
 )
 from generalresearch.models.thl.contest.contest_entry import ContestEntry
 from generalresearch.models.thl.contest.definitions import (
+    ContestEndReason,
     ContestEntryType,
     ContestPrizeKind,
-    ContestType,
     ContestStatus,
-    ContestEndReason,
+    ContestType,
 )
 from generalresearch.models.thl.contest.raffle import RaffleContest
-
+from generalresearch.models.thl.product import Product
 from tests.models.thl.test_contest.test_contest import TestContest
 
 
 class TestRaffleContest(TestContest):
 
     @pytest.fixture(scope="function")
-    def raffle_contest(self, product) -> RaffleContest:
+    def raffle_contest(self, product: Product) -> RaffleContest:
         return RaffleContest(
             product_id=product.uuid,
             name=f"Raffle Contest {uuid4().hex}",