refactor: enhance type hinting and casting for improved type safety across multiple files

tests/models/test_enums.py

@@ -3,10 +3,12 @@
 from __future__ import annotations
 
 from enum import StrEnum
+from typing import cast
 
 from app.models.activity import Activity, ActivityType
 from app.models.deal import Deal, DealStage, DealStatus
 from app.models.organization_member import OrganizationMember, OrganizationRole
+from sqlalchemy import Enum as SqlEnum
 
 
 def _values(enum_cls: type[StrEnum]) -> list[str]:
@@ -14,20 +16,20 @@ def _values(enum_cls: type[StrEnum]) -> list[str]:
 
 
 def test_organization_role_column_uses_value_strings() -> None:
-    role_type = OrganizationMember.__table__.c.role.type  # noqa: SLF001 - runtime inspection
+    role_type = cast(SqlEnum, OrganizationMember.__table__.c.role.type)  # noqa: SLF001
     assert role_type.enums == _values(OrganizationRole)
 
 
 def test_deal_status_column_uses_value_strings() -> None:
-    status_type = Deal.__table__.c.status.type  # noqa: SLF001 - runtime inspection
+    status_type = cast(SqlEnum, Deal.__table__.c.status.type)  # noqa: SLF001
     assert status_type.enums == _values(DealStatus)
 
 
 def test_deal_stage_column_uses_value_strings() -> None:
-    stage_type = Deal.__table__.c.stage.type  # noqa: SLF001 - runtime inspection
+    stage_type = cast(SqlEnum, Deal.__table__.c.stage.type)  # noqa: SLF001
     assert stage_type.enums == _values(DealStage)
 
 
 def test_activity_type_column_uses_value_strings() -> None:
-    activity_type = Activity.__table__.c.type.type  # noqa: SLF001 - runtime inspection
+    activity_type = cast(SqlEnum, Activity.__table__.c.type.type)  # noqa: SLF001
     assert activity_type.enums == _values(ActivityType)

tests/services/test_analytics_service.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections.abc import AsyncGenerator
 from datetime import datetime, timedelta, timezone
 from decimal import Decimal
+from typing import cast
 
 import pytest
 import pytest_asyncio
@@ -14,8 +15,13 @@ from app.models.deal import Deal, DealStage, DealStatus
 from app.models.organization import Organization
 from app.models.organization_member import OrganizationMember, OrganizationRole
 from app.models.user import User
-from app.repositories.analytics_repo import AnalyticsRepository
+from app.repositories.analytics_repo import (
+    AnalyticsRepository,
+    StageStatusRollup,
+    StatusRollup,
+)
 from app.services.analytics_service import AnalyticsService, invalidate_analytics_cache
+from redis.asyncio.client import Redis
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 from sqlalchemy.pool import StaticPool
 from tests.utils.fake_redis import InMemoryRedis
@@ -170,20 +176,20 @@ async def test_funnel_breakdown_contains_stage_conversions(session: AsyncSession
 
 
 class _ExplodingRepository(AnalyticsRepository):
-    async def fetch_status_rollup(self, organization_id: int):  # type: ignore[override]
+    async def fetch_status_rollup(self, organization_id: int) -> list[StatusRollup]:
         raise AssertionError("cache not used for status rollup")
 
-    async def count_new_deals_since(self, organization_id: int, threshold):  # type: ignore[override]
+    async def count_new_deals_since(self, organization_id: int, threshold: datetime) -> int:
         raise AssertionError("cache not used for new deal count")
 
-    async def fetch_stage_status_rollup(self, organization_id: int):  # type: ignore[override]
+    async def fetch_stage_status_rollup(self, organization_id: int) -> list[StageStatusRollup]:
         raise AssertionError("cache not used for funnel rollup")
 
 
 @pytest.mark.asyncio
 async def test_summary_reads_from_cache_when_available(session: AsyncSession) -> None:
     org_id, _, _ = await _seed_data(session)
-    cache = InMemoryRedis()
+    cache = cast(Redis, InMemoryRedis())
     service = AnalyticsService(
         repository=AnalyticsRepository(session),
         cache=cache,
@@ -201,7 +207,7 @@ async def test_summary_reads_from_cache_when_available(session: AsyncSession) ->
 @pytest.mark.asyncio
 async def test_invalidation_refreshes_cached_summary(session: AsyncSession) -> None:
     org_id, _, contact_id = await _seed_data(session)
-    cache = InMemoryRedis()
+    cache = cast(Redis, InMemoryRedis())
     service = AnalyticsService(
         repository=AnalyticsRepository(session),
         cache=cache,
@@ -235,7 +241,7 @@ async def test_invalidation_refreshes_cached_summary(session: AsyncSession) -> N
 @pytest.mark.asyncio
 async def test_funnel_reads_from_cache_when_available(session: AsyncSession) -> None:
     org_id, _, _ = await _seed_data(session)
-    cache = InMemoryRedis()
+    cache = cast(Redis, InMemoryRedis())
     service = AnalyticsService(
         repository=AnalyticsRepository(session),
         cache=cache,

tests/services/test_auth_service.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import cast
 from unittest.mock import MagicMock
 
-import pytest  # type: ignore[import-not-found]
+import pytest
 from app.core.security import JWTService, PasswordHasher
 from app.models.user import User
 from app.repositories.user_repo import UserRepository

tests/services/test_deal_service.py

@@ -6,8 +6,8 @@ import uuid
 from collections.abc import AsyncGenerator
 from decimal import Decimal
 
-import pytest  # type: ignore[import-not-found]
-import pytest_asyncio  # type: ignore[import-not-found]
+import pytest
+import pytest_asyncio
 from app.models.activity import Activity, ActivityType
 from app.models.base import Base
 from app.models.contact import Contact

tests/services/test_organization_service.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import cast
 from unittest.mock import MagicMock
 
-import pytest  # type: ignore[import-not-found]
+import pytest
 from app.models.organization import Organization
 from app.models.organization_member import OrganizationMember, OrganizationRole
 from app.repositories.org_repo import OrganizationRepository