[F4KRP-99] Restructure User System (#67)

* update models and run migrations

* Move address from user to driver

* migration

* add user service and update driver service 😭

* IT WORKS DWD AOWD OAWJD OAWDJ OAWJD OAWJDO WAJDOA

* fix logout button 😭

* ITS WORKING 😭

* add admin to seed script

* tests fix maybe ?

* lint

* format

* Fix type checking issues

* Edited Claude yml to debug

* removed secret

* fix for pull request finding 'Unused local variable'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

* Order migration after existing migrations

* Implement claude suggestions + fix lint

* Fixed up small stuff, verified completion

* Fix lint issues

---------

Co-authored-by: David Lu <davidjylu7@gmail.com>
Co-authored-by: David Lu <151972620+ludavidca@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
Co-authored-by: Colin Toft <colintoft@uwblueprint.org>

Author: 4 people

.env.example

@@ -0,0 +1,32 @@
+POSTGRES_DB_DEV=
+POSTGRES_DB_TEST=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+DB_HOST=
+
+APP_ENV=
+APP_NAME=
+
+ADMIN_AUTH_ID=
+
+# Firebase config
+FIREBASE_WEB_API_KEY=
+FIREBASE_REQUEST_URI=
+FIREBASE_PROJECT_ID=
+FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID=
+FIREBASE_SVC_ACCOUNT_PRIVATE_KEY=
+FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL=
+FIREBASE_SVC_ACCOUNT_CLIENT_ID=
+FIREBASE_SVC_ACCOUNT_AUTH_URI=
+FIREBASE_SVC_ACCOUNT_TOKEN_URI=
+FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL=
+FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL=
+
+# Email config
+MAILER_REFRESH_TOKEN=
+MAILER_CLIENT_ID=
+MAILER_CLIENT_SECRET=
+MAILER_USER=
+
+#Google Maps API
+GOOGLE_MAPS_API_KEY=

README.md

@@ -465,7 +465,7 @@ SELECT * FROM users; # Run SQL queries
 
 ```bash
 # Populate database with randomized test data
-docker-compose exec backend python app/seed_database.py
+docker-compose exec backend python -m app.seed_database
 ```
 
 ## Version Control Guide

backend/python/app/dependencies/auth.py

@@ -12,10 +12,12 @@
 from app.services.implementations.auth_service import AuthService
 from app.services.implementations.driver_service import DriverService
 from app.services.implementations.email_service import EmailService
+from app.services.implementations.user_service import UserService
 
 # Initialize services
 logger = logging.getLogger(__name__)
 driver_service = DriverService(logger)
+user_service = UserService(logger)
 email_service = EmailService(
     logger,
     {
@@ -27,7 +29,7 @@
     settings.mailer_user,
     "Food4Kids",
 )
-auth_service = AuthService(logger, driver_service, email_service)
+auth_service = AuthService(logger, user_service, driver_service, email_service)
 
 # Security scheme
 security = HTTPBearer()
@@ -170,16 +172,16 @@ def get_current_user_email(access_token: str = Depends(get_access_token)) -> str
         ) from e
 
 
-async def get_current_database_driver_id(
+async def get_current_database_user_id(
     access_token: str = Depends(get_access_token),
     session: AsyncSession = Depends(get_session),
 ) -> UUID:
     """
-    Get the current database driver ID from the access token
+    Get the current database user ID from the access token
 
     :param access_token: JWT access token
     :param session: Database session
-    :return: Database driver ID (UUID)
+    :return: Database user ID (UUID)
     """
     try:
         decoded_token: dict[str, str] = firebase_admin.auth.verify_id_token(
@@ -188,16 +190,16 @@ async def get_current_database_driver_id(
         firebase_uid = decoded_token["uid"]
 
         # Convert Firebase UID to database driver ID
-        database_driver_id = await driver_service.get_driver_id_by_auth_id(
+        database_user_id = await user_service.get_user_id_by_auth_id(
             session, firebase_uid
         )
-        if database_driver_id is None:
+        if database_user_id is None:
             raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED, detail="Driver not found"
+                status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found"
             )
-        return database_driver_id
+        return database_user_id
     except Exception as e:
-        logger.error(f"Failed to get database driver ID from access token: {e}")
+        logger.error(f"Failed to get database user ID from access token: {e}")
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid or expired token"
         ) from e

backend/python/app/dependencies/services.py

@@ -22,6 +22,7 @@
 from app.services.implementations.route_group_service import RouteGroupService
 from app.services.implementations.scheduler_service import SchedulerService
 from app.services.implementations.simple_entity_service import SimpleEntityService
+from app.services.implementations.user_service import UserService
 from app.services.protocols.routing_algorithm import RoutingAlgorithmProtocol
 from app.utilities.google_maps_client import GoogleMapsClient
 
@@ -49,6 +50,13 @@ def get_email_service() -> EmailService:
     )
 
 
+@lru_cache
+def get_user_service() -> UserService:
+    """Get user service instance"""
+    logger = get_logger()
+    return UserService(logger)
+
+
 @lru_cache
 def get_driver_service() -> DriverService:
     """Get driver service instance"""
@@ -57,12 +65,13 @@ def get_driver_service() -> DriverService:
 
 
 def get_auth_service(
+    user_service: UserService = Depends(get_user_service),
     driver_service: DriverService = Depends(get_driver_service),
     email_service: EmailService = Depends(get_email_service),
 ) -> AuthService:
     """Get auth service instance"""
     logger = get_logger()
-    return AuthService(logger, driver_service, email_service)
+    return AuthService(logger, user_service, driver_service, email_service)
 
 
 @lru_cache

backend/python/app/models/__init__.py

@@ -93,6 +93,8 @@ def init_app(_app: Any | None = None) -> None:
     from .route_group_membership import RouteGroupMembership  # noqa: F401
     from .route_stop import RouteStop  # noqa: F401
     from .simple_entity import SimpleEntity  # noqa: F401
+    from .system_settings import SystemSettings  # noqa: F401
+    from .user import User  # noqa: F401
 
     init_database()
 

backend/python/app/models/admin.py

@@ -1,9 +1,9 @@
-import datetime
 from uuid import UUID, uuid4
 
 from pydantic import EmailStr, field_validator
-from sqlmodel import Field, SQLModel
+from sqlmodel import Field, Relationship, SQLModel
 
+from app.models.user import User
 from app.utilities.utils import validate_phone
 
 from .base import BaseModel
@@ -12,12 +12,8 @@
 class AdminBase(SQLModel):
     """Shared fields between table and API models"""
 
-    admin_name: str = Field(min_length=1, max_length=100, nullable=False)
-    default_cap: int | None = Field(default=None)
+    receive_email_notifications: bool = Field(default=True, nullable=False)
     admin_phone: str = Field(min_length=1, max_length=100, nullable=False)
-    admin_email: EmailStr = Field(nullable=False)
-    route_start_time: datetime.time | None = Field(default=None)
-    warehouse_location: str | None = Field(default=None, min_length=1)
 
     @field_validator("admin_phone")
     @classmethod
@@ -32,26 +28,37 @@ class Admin(AdminBase, BaseModel, table=True):
     __tablename__ = "admin_info"
 
     admin_id: UUID = Field(default_factory=uuid4, primary_key=True)
+    user_id: UUID = Field(foreign_key="users.user_id", unique=True, nullable=False)
+
+    user: User = Relationship()
 
 
 class AdminCreate(AdminBase):
     """Create request model"""
 
+    user_id: UUID
     pass
 
 
 class AdminRead(AdminBase):
     """Read response model"""
 
     admin_id: UUID
+    user_id: UUID
+
+    # pulled from User
+    name: str
+    email: EmailStr
+    auth_id: str
+    role: str
 
 
 class AdminUpdate(SQLModel):
     """Update request model - all optional"""
 
-    admin_name: str | None = Field(default=None, min_length=1, max_length=100)
-    default_cap: int | None = Field(default=None)
+    # admin-specific
     admin_phone: str | None = Field(default=None, min_length=1, max_length=100)
-    admin_email: EmailStr | None = Field(default=None)
-    route_start_time: datetime.time | None = Field(default=None)
-    warehouse_location: str | None = Field(default=None, min_length=1)
+
+    # user fields
+    name: str | None = Field(default=None, min_length=1, max_length=255)
+    email: EmailStr | None = Field(default=None)

backend/python/app/models/driver.py

@@ -1,22 +1,21 @@
 from uuid import UUID, uuid4
 
 from pydantic import EmailStr, field_validator
-from sqlmodel import Field, SQLModel
+from sqlmodel import Field, Relationship, SQLModel
 
+from app.models.user import User
 from app.utilities.utils import validate_phone
 
 from .base import BaseModel
 
 
 class DriverBase(SQLModel):
-    name: str = Field(min_length=1, max_length=255)
-    email: EmailStr = Field(unique=True, index=True, max_length=254)
     phone: str = Field(min_length=1, max_length=20)
-    address: str = Field(min_length=1, max_length=255)
     license_plate: str = Field(min_length=1, max_length=20)
     car_make_model: str = Field(min_length=1, max_length=255)
     active: bool = Field(default=True)
     notes: str = Field(default="", max_length=1024)
+    address: str = Field(min_length=1, max_length=255)
 
     @field_validator("phone")
     @classmethod
@@ -29,19 +28,33 @@ class Driver(DriverBase, BaseModel, table=True):
     __tablename__ = "drivers"
 
     driver_id: UUID = Field(default_factory=uuid4, primary_key=True, index=True)
-    auth_id: str = Field(nullable=False, unique=True, index=True)
+    user_id: UUID = Field(foreign_key="users.user_id", unique=True, nullable=False)
+    user: User = Relationship()
 
 
 class DriverCreate(DriverBase):
-    password: str = Field(min_length=8, max_length=100)
+    user_id: UUID  # link to created User
 
 
 class DriverRead(DriverBase):
     driver_id: UUID
     auth_id: str
+    user_id: UUID
+    name: str
+    email: EmailStr
+    role: str  # comes from User
 
 
 class DriverUpdate(SQLModel):
+    phone: str | None = Field(default=None, min_length=1, max_length=20)
+    address: str | None = Field(default=None, min_length=1, max_length=255)
+    license_plate: str | None = Field(default=None, min_length=1, max_length=20)
+    car_make_model: str | None = Field(default=None, min_length=1, max_length=255)
+    active: bool | None = Field(default=None)
+    notes: str | None = Field(default=None, max_length=1024)
+
+
+class DriverUpdatePayload(SQLModel):
     name: str | None = Field(default=None, min_length=1, max_length=255)
     email: EmailStr | None = Field(default=None, max_length=254)
     phone: str | None = Field(default=None, min_length=1, max_length=20)
@@ -55,13 +68,16 @@ class DriverUpdate(SQLModel):
 class DriverRegister(SQLModel):
     """Driver registration request"""
 
+    # User fields
     name: str = Field(min_length=1, max_length=255)
     email: EmailStr = Field(max_length=254)
+    password: str = Field(min_length=8, max_length=100)
+
+    # Driver fields
     phone: str = Field(min_length=1, max_length=20)
-    address: str = Field(min_length=1, max_length=255)
     license_plate: str = Field(min_length=1, max_length=20)
     car_make_model: str = Field(min_length=1, max_length=255)
-    password: str = Field(min_length=8, max_length=100)
+    address: str = Field(min_length=1, max_length=255)
 
     @field_validator("phone")
     @classmethod

backend/python/app/models/system_settings.py

@@ -0,0 +1,42 @@
+import datetime
+from uuid import UUID, uuid4
+
+from sqlmodel import Field, SQLModel
+
+from .base import BaseModel
+
+
+class SystemSettingsBase(SQLModel):
+    """Shared fields between table and API models"""
+
+    default_cap: int | None = Field(default=None)
+    route_start_time: datetime.time | None = Field(default=None)
+    warehouse_location: str | None = Field(default=None, min_length=1)
+    warehouse_longitude: float | None = None
+    warehouse_latitude: float | None = None
+
+
+class SystemSettings(SystemSettingsBase, BaseModel, table=True):
+    """Database table model"""
+
+    __tablename__ = "system_settings"
+
+    system_settings_id: UUID = Field(default_factory=uuid4, primary_key=True)
+
+
+class SystemSettingsCreate(SystemSettingsBase):
+    """Create request model"""
+
+    pass
+
+
+class SystemSettingsRead(SystemSettingsBase):
+    """Read response model"""
+
+    system_settings_id: UUID
+
+
+class SystemSettingsUpdate(SystemSettingsBase):
+    """Update request model - all optional"""
+
+    pass

backend/python/app/models/user.py

@@ -0,0 +1,42 @@
+from uuid import UUID, uuid4
+
+from pydantic import EmailStr
+from sqlmodel import Field, SQLModel
+
+from .base import BaseModel
+
+
+class UserBase(SQLModel):
+    name: str = Field(min_length=1, max_length=255)
+    email: EmailStr = Field(unique=True, index=True, max_length=254)
+
+
+class User(UserBase, BaseModel, table=True):
+    __tablename__ = "users"
+
+    user_id: UUID = Field(default_factory=uuid4, primary_key=True, index=True)
+    auth_id: str = Field(nullable=False, unique=True, index=True)
+    role: str = Field(min_length=1, max_length=255, default="driver")
+
+
+class UserCreate(UserBase):
+    password: str = Field(min_length=8, max_length=100)
+
+
+class UserRead(UserBase):
+    user_id: UUID
+    auth_id: str
+    role: str
+
+
+class UserUpdate(SQLModel):
+    name: str | None = Field(default=None, min_length=1, max_length=255)
+    email: EmailStr | None = Field(default=None, max_length=254)
+
+
+class UserRegister(SQLModel):
+    """User registration request"""
+
+    name: str = Field(min_length=1, max_length=255)
+    email: EmailStr = Field(max_length=254)
+    password: str = Field(min_length=8, max_length=100)