Store User Language on Registration (#79)

Add a column to the user table to store their language (either English
or French)

On registration, when they select either french or english we need to
store that.

Then update the directory to show the user’s language rather than
hardcoding it to English

## Notion ticket link
<!-- Please replace with your ticket's URL -->
[Ticket
Name](https://www.notion.so/uwblueprintexecs/Store-User-Language-on-Registration-2a310f3fb1dc8055b3a4fded02a1f6a0?source=copy_link)


<!-- Give a quick summary of the implementation details, provide design
justifications if necessary -->
## Implementation description
* 


<!-- What should the reviewer do to verify your changes? Describe
expected results and include screenshots when appropriate -->
## Steps to test
1.


<!-- Draw attention to the substantial parts of your PR or anything
you'd like a second opinion on -->
## What should reviewers focus on?
* 


## Checklist
- [ ] My PR name is descriptive and in imperative tense
- [ ] My commit messages are descriptive and in imperative tense. My
commits are atomic and trivial commits are squashed or fixup'd into
non-trivial commits
- [ ] I have run the appropriate linter(s)
- [ ] I have requested a review from the PL, as well as other devs who
have background knowledge on this PR or who will be building on top of
this PR

Author: chene0

backend/app/models/User.py

@@ -21,6 +21,11 @@ class FormStatus(str, PyEnum):
     REJECTED = "rejected"
 
 
+class Language(str, PyEnum):
+    ENGLISH = "en"
+    FRENCH = "fr"
+
+
 class User(Base):
     __tablename__ = "users"
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
@@ -42,6 +47,16 @@ class User(Base):
         nullable=False,
         default=FormStatus.INTAKE_TODO,
     )
+    language = Column(
+        SQLEnum(
+            Language,
+            name="language_enum",
+            create_type=False,
+            values_callable=lambda enum_cls: [member.value for member in enum_cls],
+        ),
+        nullable=False,
+        default=Language.ENGLISH,
+    )
 
     role = relationship("Role")
 

backend/app/models/__init__.py

@@ -21,7 +21,7 @@
 from .Task import Task, TaskPriority, TaskStatus, TaskType
 from .TimeBlock import TimeBlock
 from .Treatment import Treatment
-from .User import FormStatus, User
+from .User import FormStatus, Language, User
 from .UserData import UserData
 from .VolunteerData import VolunteerData
 
@@ -44,6 +44,7 @@
     "Form",
     "FormSubmission",
     "FormStatus",
+    "Language",
     "Task",
     "TaskType",
     "TaskPriority",

backend/app/routes/auth.py

@@ -124,16 +124,7 @@ async def get_current_user(
         if not user:
             raise HTTPException(status_code=404, detail="User not found")
 
-        return UserCreateResponse(
-            id=user.id,
-            first_name=user.first_name,
-            last_name=user.last_name,
-            email=user.email,
-            role_id=user.role_id,
-            auth_id=user.auth_id,
-            approved=user.approved,
-            form_status=user.form_status,
-        )
+        return UserCreateResponse.model_validate(user)
     except HTTPException:
         raise
     except Exception as e:

backend/app/schemas/user.py

@@ -50,6 +50,11 @@ class FormStatus(str, Enum):
     REJECTED = "rejected"
 
 
+class Language(str, Enum):
+    ENGLISH = "en"
+    FRENCH = "fr"
+
+
 class UserBase(BaseModel):
     """
     Base schema for user model with common attributes shared across schemas.
@@ -107,6 +112,7 @@ class UserUpdateRequest(BaseModel):
     role: Optional[UserRole] = None
     approved: Optional[bool] = None
     form_status: Optional[FormStatus] = None
+    language: Optional[Language] = None
 
 
 class UserCreateResponse(BaseModel):
@@ -122,6 +128,7 @@ class UserCreateResponse(BaseModel):
     auth_id: str
     approved: bool
     form_status: FormStatus
+    language: Language
 
     # from_attributes enables automatic mapping from SQLAlchemy model to Pydantic model
     model_config = ConfigDict(from_attributes=True)
@@ -145,6 +152,7 @@ class UserResponse(BaseModel):
     user_data: Optional[UserDataResponse] = None
     volunteer_data: Optional[VolunteerDataResponse] = None
     availability: List[AvailabilityTemplateSlot] = []
+    language: Language
 
     model_config = ConfigDict(from_attributes=True)
 

backend/app/seeds/users.py

@@ -14,7 +14,7 @@
 from app.models.SuggestedTime import suggested_times
 from app.models.Task import Task
 from app.models.Treatment import Treatment
-from app.models.User import FormStatus, User
+from app.models.User import FormStatus, Language, User
 from app.models.UserData import UserData
 from app.models.VolunteerData import VolunteerData
 from app.utilities.form_constants import ExperienceId, TreatmentId
@@ -375,6 +375,7 @@ def seed_users(session: Session) -> None:
             approved=True,
             active=True,
             form_status=FormStatus.INTAKE_TODO,
+            language=Language.ENGLISH,
         )
         session.add(user)
         session.flush()  # Get user ID

backend/app/services/implementations/intake_form_processor.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy.orm import Session
 
-from app.models import Experience, FormStatus, Treatment, User, UserData
+from app.models import Experience, FormStatus, Language, Treatment, User, UserData
 
 logger = logging.getLogger(__name__)
 
@@ -86,6 +86,8 @@ def process_form_submission(self, user_id: str, form_data: Dict[str, Any]) -> Us
 
             if "additional_info" in form_data:
                 user_data.additional_info = self._trim_text(form_data.get("additional_info"))
+            # Update language for owning user
+            owning_user.language = form_data.get("language", Language.ENGLISH)
 
             # Commit all changes
             self.db.commit()

backend/app/services/implementations/match_service.py

@@ -806,10 +806,11 @@ def _attach_initial_suggested_times(self, match: Match, volunteer: User) -> None
             )
             volunteer_tz = timezone.utc
 
-        # Project templates onto the next week
-        projection_weeks = 1
+        # Project templates 8 days ahead (1 week + 1 day) to ensure we capture at least one future
+        # occurrence of each template day, even if today's times have already passed
+        projection_days = 8
 
-        for day_offset in range(projection_weeks * 7):
+        for day_offset in range(projection_days):
             # Calculate target date in UTC
             target_date_utc = now + timedelta(days=day_offset)
 

backend/migrations/versions/329a7ab72d38_add_language_enum_and_column_to_users_.py

@@ -0,0 +1,44 @@
+"""add language enum and column to users model
+
+Revision ID: 329a7ab72d38
+Revises: 8d2cd99b9eb8
+Create Date: 2025-11-06 19:37:26.647630
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "329a7ab72d38"
+down_revision: Union[str, None] = "8d2cd99b9eb8"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+_LANGUAGE_VALUES = (
+    "en",
+    "fr",
+)
+
+_DEFAULT_LANGUAGE = "en"
+
+
+def upgrade() -> None:
+    op.execute("CREATE TYPE language_enum AS ENUM ('en', 'fr')")
+
+    op.add_column(
+        "users",
+        sa.Column(
+            "language",
+            sa.Enum(*_LANGUAGE_VALUES, name="language_enum", create_type=False),
+            nullable=False,
+            server_default=_DEFAULT_LANGUAGE,
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("users", "language")
+    op.execute("DROP TYPE language_enum")

backend/migrations/versions/77423a45f740_merge_multiple_heads_drop_available_.py

@@ -0,0 +1,23 @@
+"""merge multiple heads drop_available_times_table
+
+Revision ID: 77423a45f740
+Revises: 93cc5dac324a, dda4b46776e9
+Create Date: 2025-11-24 21:20:43.406772
+
+"""
+
+from typing import Sequence, Union
+
+# revision identifiers, used by Alembic.
+revision: str = "77423a45f740"
+down_revision: Union[str, None] = ("93cc5dac324a", "dda4b46776e9")
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

backend/migrations/versions/93cc5dac324a_merge_multiple_heads.py

@@ -0,0 +1,23 @@
+"""merge multiple heads
+
+Revision ID: 93cc5dac324a
+Revises: 23dae9594e1d, 329a7ab72d38
+Create Date: 2025-11-24 19:04:33.167997
+
+"""
+
+from typing import Sequence, Union
+
+# revision identifiers, used by Alembic.
+revision: str = "93cc5dac324a"
+down_revision: Union[str, None] = ("23dae9594e1d", "329a7ab72d38")
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass