Add tests

Author: ColinToft

backend/python/app/routers/driver_routes.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Query, status
@@ -15,6 +16,25 @@
 router = APIRouter(prefix="/drivers", tags=["drivers"])
 
 
+def driver_to_driver_read(driver: Any) -> DriverRead:
+    """Convert a Driver model instance to DriverRead."""
+    return DriverRead(
+        driver_id=driver.driver_id,
+        user_id=driver.user_id,
+        phone=driver.phone,
+        license_plate=driver.license_plate,
+        car_make_model=driver.car_make_model,
+        active=driver.active,
+        notes=driver.notes,
+        address=driver.address,
+        # User fields
+        auth_id=driver.user.auth_id,
+        name=driver.user.name,
+        email=driver.user.email,
+        role=driver.user.role,
+    )
+
+
 @router.get("/", response_model=list[DriverRead])
 async def get_drivers(
     session: AsyncSession = Depends(get_session),
@@ -39,7 +59,7 @@ async def get_drivers(
                     status_code=status.HTTP_404_NOT_FOUND,
                     detail=f"Driver with id {driver_id} not found",
                 )
-            return [DriverRead.model_validate(driver)]
+            return [driver_to_driver_read(driver)]
 
         elif email:
             driver = await driver_service.get_driver_by_email(session, email)
@@ -48,11 +68,11 @@ async def get_drivers(
                     status_code=status.HTTP_404_NOT_FOUND,
                     detail=f"Driver with email {email} not found",
                 )
-            return [DriverRead.model_validate(driver)]
+            return [driver_to_driver_read(driver)]
 
         else:
             drivers = await driver_service.get_drivers(session)
-            return [DriverRead.model_validate(driver) for driver in drivers]
+            return [driver_to_driver_read(driver) for driver in drivers]
 
     except HTTPException:
         raise
@@ -77,7 +97,7 @@ async def get_driver(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=f"Driver with id {driver_id} not found",
         )
-    return DriverRead.model_validate(driver)
+    return driver_to_driver_read(driver)
 
 
 @router.post("/", response_model=DriverRead, status_code=status.HTTP_201_CREATED)
@@ -91,7 +111,7 @@ async def create_driver(
     """
     try:
         created_driver = await driver_service.create_driver(session, driver)
-        return DriverRead.model_validate(created_driver)
+        return driver_to_driver_read(created_driver)
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)
@@ -116,7 +136,7 @@ async def update_driver(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=f"Driver with id {driver_id} not found",
         )
-    return DriverRead.model_validate(updated_driver)
+    return driver_to_driver_read(updated_driver)
 
 
 @router.delete("/{driver_id}", status_code=status.HTTP_204_NO_CONTENT)

backend/python/app/routers/route_group_routes.py

@@ -33,9 +33,9 @@ async def get_route_groups(
         )
         result = []
         for route_group in route_groups:
-            data = RouteGroupRead.model_validate(route_group).model_dump()
-            membership_count = len(route_group.route_group_memberships)
-            data["num_routes"] = membership_count
+            data = RouteGroupRead.model_validate(
+                route_group, from_attributes=True
+            ).model_dump()
             if include_routes:
                 data["routes"] = [
                     {
@@ -76,15 +76,7 @@ async def create_route_group(
         created_route_group = await route_group_service.create_route_group(
             session, route_group
         )
-        return RouteGroupRead(
-            route_group_id=created_route_group.route_group_id,
-            name=created_route_group.name,
-            notes=created_route_group.notes,
-            drive_date=created_route_group.drive_date,
-            created_at=created_route_group.created_at,
-            updated_at=created_route_group.updated_at,
-            num_routes=0,
-        )
+        return RouteGroupRead.model_validate(created_route_group, from_attributes=True)
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)
@@ -110,7 +102,9 @@ async def update_route_group(
                 status_code=status.HTTP_404_NOT_FOUND,
                 detail=f"RouteGroup with id {route_group_id} not found",
             )
-        return RouteGroupRead.model_validate(updated_route_group)
+        return RouteGroupRead.model_validate(updated_route_group, from_attributes=True)
+    except HTTPException:
+        raise
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)
@@ -133,6 +127,8 @@ async def delete_route_group(
                 status_code=status.HTTP_404_NOT_FOUND,
                 detail=f"RouteGroup with id {route_group_id} not found",
             )
+    except HTTPException:
+        raise
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)

backend/python/app/seed_database.py

@@ -405,7 +405,8 @@ def main() -> None:
 
             # Create locations from CSV
             print("Creating locations from CSV...")
-            csv_path = "app/data/locations.csv"
+            # Allow CSV path to be overridden via environment variable for testing
+            csv_path = os.getenv("LOCATIONS_CSV_PATH", "app/data/locations.csv")
             locations_created = 0
 
             non_school_groups = [
@@ -507,12 +508,22 @@ def main() -> None:
             print("Creating drivers...")
             num_drivers = max(routes_created, MIN_DRIVERS)
             drivers_created = 0
+            used_emails: set[str] = set()
 
             for _ in range(num_drivers):
                 # Create a single driver with fake data
+                # Ensure unique email
+                email = fake.email()
+                max_email_attempts = 100
+                email_attempts = 0
+                while email in used_emails and email_attempts < max_email_attempts:
+                    email = fake.email()
+                    email_attempts += 1
+                used_emails.add(email)
+
                 user = User(
                     name=fake.name(),
-                    email=fake.email(),
+                    email=email,
                     auth_id=f"seed_driver_{uuid.uuid4().hex[:8]}",
                 )
                 set_timestamps(user)

backend/python/app/services/implementations/driver_service.py

@@ -2,6 +2,7 @@
 from uuid import UUID
 
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
 from sqlmodel import select
 
 from app.models.driver import Driver, DriverCreate, DriverUpdate
@@ -19,7 +20,11 @@ async def get_driver_by_id(
     ) -> Driver | None:
         """Get driver by ID - returns SQLModel instance"""
         try:
-            statement = select(Driver).where(Driver.driver_id == driver_id)
+            statement = (
+                select(Driver)
+                .options(selectinload(Driver.user))  # type: ignore[arg-type]
+                .where(Driver.driver_id == driver_id)
+            )
             result = await session.execute(statement)
             driver = result.scalars().first()
 
@@ -37,7 +42,12 @@ async def get_driver_by_email(
     ) -> Driver | None:
         """Get driver by email using Firebase"""
         try:
-            statement = select(Driver).join(Driver.user).where(User.email == email)  # type: ignore[arg-type]
+            statement = (
+                select(Driver)
+                .options(selectinload(Driver.user))  # type: ignore[arg-type]
+                .join(Driver.user)  # type: ignore[arg-type]
+                .where(User.email == email)
+            )
             result = await session.execute(statement)
             driver = result.scalars().first()
 
@@ -55,7 +65,11 @@ async def get_driver_by_auth_id(
     ) -> Driver | None:
         """Get driver by auth_id"""
         try:
-            statement = select(Driver).join(Driver.user).where(User.auth_id == auth_id)  # type: ignore[arg-type]
+            statement = (
+                select(Driver)
+                .join(Driver.user)  # type: ignore[arg-type]
+                .where(User.auth_id == auth_id)
+            )
             result = await session.execute(statement)
             driver = result.scalars().first()
 
@@ -71,7 +85,7 @@ async def get_driver_by_auth_id(
     async def get_drivers(self, session: AsyncSession) -> list[Driver]:
         """Get all drivers - returns SQLModel instances"""
         try:
-            statement = select(Driver)
+            statement = select(Driver).options(selectinload(Driver.user))  # type: ignore[arg-type]
             result = await session.execute(statement)
             return list(result.scalars().all())
         except Exception as e:
@@ -98,7 +112,7 @@ async def create_driver(
             try:
                 session.add(driver)
                 await session.commit()
-                await session.refresh(driver)
+                await session.refresh(driver, attribute_names=["user"])
                 return driver
 
             except Exception as db_error:
@@ -113,7 +127,11 @@ async def update_driver_by_id(
     ) -> Driver | None:
         """Update driver by ID"""
         try:
-            statement = select(Driver).where(Driver.driver_id == driver_id)
+            statement = (
+                select(Driver)
+                .options(selectinload(Driver.user))  # type: ignore[arg-type]
+                .where(Driver.driver_id == driver_id)
+            )
             result = await session.execute(statement)
             driver = result.scalars().first()
 
@@ -144,7 +162,7 @@ async def update_driver_by_id(
                 driver.notes = driver_data.notes
 
             await session.commit()
-            await session.refresh(driver)
+            await session.refresh(driver, attribute_names=["user"])
             return driver
 
         except Exception as e:
@@ -201,7 +219,11 @@ async def get_driver_id_by_auth_id(
     ) -> UUID | None:
         """Get driver_id by auth_id"""
         try:
-            statement = select(Driver).join(Driver.user).where(User.auth_id == auth_id)  # type: ignore[arg-type]
+            statement = (
+                select(Driver)
+                .join(Driver.user)  # type: ignore[arg-type]
+                .where(User.auth_id == auth_id)
+            )
             result = await session.execute(statement)
             driver = result.scalars().first()
 
@@ -217,7 +239,11 @@ async def get_driver_id_by_auth_id(
     async def delete_driver_by_email(self, session: AsyncSession, email: str) -> None:
         """Delete driver by email"""
         try:
-            statement = select(Driver).join(Driver.user).where(User.email == email)  # type: ignore[arg-type]
+            statement = (
+                select(Driver)
+                .join(Driver.user)  # type: ignore[arg-type]
+                .where(User.email == email)
+            )
             result = await session.execute(statement)
             driver = result.scalars().first()
 

backend/python/app/services/implementations/route_group_service.py

@@ -21,7 +21,7 @@ async def create_route_group(
         route_group = RouteGroup.model_validate(route_group_data)
         session.add(route_group)
         await session.commit()
-        await session.refresh(route_group)
+        await session.refresh(route_group, ["route_group_memberships"])
         return route_group
 
     async def update_route_group(
@@ -46,7 +46,7 @@ async def update_route_group(
             setattr(route_group, field, value)
 
         await session.commit()
-        await session.refresh(route_group)
+        await session.refresh(route_group, ["route_group_memberships"])
 
         return route_group
 

backend/python/app/services/jobs/email_reminder_jobs.py

@@ -12,6 +12,7 @@
 from app.models.driver import Driver
 from app.models.driver_assignment import DriverAssignment
 from app.models.route import Route
+from app.models.user import User
 from app.services.implementations.email_service import EmailService
 
 
@@ -40,21 +41,21 @@ async def process_daily_reminder_emails() -> None:
             # Get all drivers assigned to routes tomorrow
             statement = (
                 select(
-                    Driver.email,
+                    User.email,
                     DriverAssignment.time,
                     Route.length,
                 )
                 .join(Route, DriverAssignment.route_id == Route.route_id)  # type: ignore[arg-type]
                 .join(Driver, DriverAssignment.driver_id == Driver.driver_id)  # type: ignore[arg-type]
+                .join(User, Driver.user_id == User.user_id)  # type: ignore[arg-type]
                 .where(
                     and_(
-                        Driver.email is not None,  # type: ignore[arg-type]
                         DriverAssignment.time >= start_of_day,  # type: ignore[arg-type]
                         DriverAssignment.time <= end_of_day,  # type: ignore[arg-type]
                         DriverAssignment.completed.is_(False),  # type: ignore[attr-defined]
                     )
                 )
-                .order_by(Driver.email)
+                .order_by(User.email)
             )
 
             result = await session.execute(statement)

backend/python/requirements.txt

@@ -74,7 +74,7 @@ numpy==1.26.4
 scikit-learn==1.5.0
 scikit-learn-extra==0.2.0
 seaborn==0.13.2
-matplotlib==3.10.0
+matplotlib>=3.10.8
 pandas==2.3.3
 pandas-stubs
 types-seaborn

backend/python/tests/conftest.py

@@ -36,7 +36,7 @@ async def test_db_engine() -> AsyncGenerator[Any, None]:
 
     # Use PostgreSQL for testing to support ARRAY types
     database_url = os.getenv(
-        "TEST_DATABASE_URL", "postgresql+asyncpg://postgres:postgres@db:5432/f4k"
+        "TEST_DATABASE_URL", "postgresql+asyncpg://postgres:postgres@db:5432/f4k_test"
     )
 
     engine = create_async_engine(
@@ -105,11 +105,8 @@ def client(test_session: AsyncSession) -> Generator[TestClient, None, None]:
     app = create_app()
 
     # Override the database session dependency
-    def override_get_session() -> AsyncGenerator[AsyncSession, None]:
-        async def _get_session() -> AsyncGenerator[AsyncSession, None]:
-            yield test_session
-
-        return _get_session()
+    async def override_get_session() -> AsyncGenerator[AsyncSession, None]:
+        yield test_session
 
     app.dependency_overrides[get_session] = override_get_session
 
@@ -125,11 +122,8 @@ async def async_client(
     app = create_app()
 
     # Override the database session dependency
-    def override_get_session() -> AsyncGenerator[AsyncSession, None]:
-        async def _get_session() -> AsyncGenerator[AsyncSession, None]:
-            yield test_session
-
-        return _get_session()
+    async def override_get_session() -> AsyncGenerator[AsyncSession, None]:
+        yield test_session
 
     app.dependency_overrides[get_session] = override_get_session