Skip to content
Merged

Dev #132

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions routes/tests/test_checkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def setUp(self) -> None:
last_name="user",
password=generate_hash_password("password"),
is_active=True,
participant_type="Student",
)
self.db.add(self.test_user)
self.db.commit()
Expand Down
11 changes: 4 additions & 7 deletions schemas/checkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from enum import Enum
from core.log import logger
from pydantic import BaseModel, EmailStr, Field
from schemas.user_profile import ParticipantType, TShirtSize
from models.User import User


Expand All @@ -11,8 +10,8 @@ class CheckinUserResponse(BaseModel):
email: Optional[EmailStr] = None
first_name: Optional[str] = None
last_name: Optional[str] = None
t_shirt_size: Optional[TShirtSize] = None
participant_type: Optional[ParticipantType] = None
t_shirt_size: Optional[str] = None
participant_type: Optional[str] = None
checked_in_day1: bool = False
checked_in_day2: bool = False

Expand All @@ -34,10 +33,8 @@ def user_model_to_checkin_response(user: User) -> CheckinUserResponse:
tshirt_size = None
participant_type = None
try:
tshirt_size = TShirtSize(user.t_shirt_size) if user.t_shirt_size else None
participant_type = (
ParticipantType(user.participant_type) if user.participant_type else None
)
tshirt_size = user.t_shirt_size
participant_type = user.participant_type
except ValueError as e:
logger.error(f"Invalid enum value in user model: {e}")

Expand Down
Loading