Refactor user data service and models for improved readability

- Reformatted method signatures and SQLAlchemy model definitions for better clarity.
- Ensured consistent line endings and spacing across user data service and related files.
- Updated exception handling messages for better readability in the user data service implementation.

Author: daniel-su1

backend/app/interfaces/user_data_service.py

@@ -49,7 +49,9 @@ def create_user_data(self, user_data: UserDataCreateRequest):
         pass
 
     @abstractmethod
-    def update_user_data_by_user_id(self, user_id: UUID, user_data: UserDataUpdateRequest):
+    def update_user_data_by_user_id(
+        self, user_id: UUID, user_data: UserDataUpdateRequest
+    ):
         """
         Update user data for a user
 
@@ -83,4 +85,4 @@ def delete_user_data_by_user_id(self, user_id: UUID):
         :type user_id: UUID
         :raises Exception: if user data deletion fails
         """
-        pass 
+        pass

backend/app/models/UserData.py

@@ -10,7 +10,9 @@
 class UserData(Base):
     __tablename__ = "user_data"
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False, unique=True)
+    user_id = Column(
+        UUID(as_uuid=True), ForeignKey("users.id"), nullable=False, unique=True
+    )
     date_of_birth = Column(Date, nullable=True)
     email = Column(String(120), nullable=True)
     phone = Column(String(20), nullable=True)
@@ -34,4 +36,4 @@ class UserData(Base):
     preferences = Column(Text, nullable=True)
 
     # Relationship to User table
-    user = relationship("User", back_populates="user_data") 
+    user = relationship("User", back_populates="user_data")

backend/app/routes/user_data.py

@@ -22,7 +22,9 @@
 async def create_user_data(
     user_data: UserDataCreateRequest,
     user_data_service: UserDataService = Depends(get_user_data_service),
-    authorized: bool = has_roles([UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER]),
+    authorized: bool = has_roles(
+        [UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER]
+    ),
 ):
     """Create user data for intake form"""
     try:
@@ -37,7 +39,9 @@ async def create_user_data(
 async def get_user_data_by_user_id(
     user_id: UUID,
     user_data_service: UserDataService = Depends(get_user_data_service),
-    authorized: bool = has_roles([UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER]),
+    authorized: bool = has_roles(
+        [UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER]
+    ),
 ):
     """Get user data by user ID"""
     try:
@@ -68,7 +72,9 @@ async def update_user_data_by_user_id(
     user_id: UUID,
     user_data: UserDataUpdateRequest,
     user_data_service: UserDataService = Depends(get_user_data_service),
-    authorized: bool = has_roles([UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER]),
+    authorized: bool = has_roles(
+        [UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER]
+    ),
 ):
     """Update user data by user ID"""
     try:
@@ -108,4 +114,4 @@ async def delete_user_data_by_user_id(
     except HTTPException as http_ex:
         raise http_ex
     except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e)) 
+        raise HTTPException(status_code=500, detail=str(e))

backend/app/schemas/user_data.py

@@ -64,4 +64,4 @@ class UserDataResponse(UserDataBase):
     user_id: UUID
 
     # from_attributes enables automatic mapping from SQLAlchemy model to Pydantic model
-    model_config = ConfigDict(from_attributes=True) 
+    model_config = ConfigDict(from_attributes=True)

backend/app/services/implementations/user_data_service.py

@@ -23,23 +23,34 @@ def get_user_data_by_id(self, user_data_id: UUID) -> UserDataResponse:
         """Get user data by its ID"""
         user_data = self.db.query(UserData).filter(UserData.id == user_data_id).first()
         if not user_data:
-            raise HTTPException(status_code=404, detail=f"User data with id {user_data_id} not found")
+            raise HTTPException(
+                status_code=404, detail=f"User data with id {user_data_id} not found"
+            )
         return UserDataResponse.model_validate(user_data)
 
     def get_user_data_by_user_id(self, user_id: UUID) -> UserDataResponse:
         """Get user data by user ID"""
         user_data = self.db.query(UserData).filter(UserData.user_id == user_id).first()
         if not user_data:
-            raise HTTPException(status_code=404, detail=f"User data for user {user_id} not found")
+            raise HTTPException(
+                status_code=404, detail=f"User data for user {user_id} not found"
+            )
         return UserDataResponse.model_validate(user_data)
 
     def create_user_data(self, user_data: UserDataCreateRequest) -> UserDataResponse:
         """Create user data for a user"""
         try:
             # Check if user data already exists for this user
-            existing_data = self.db.query(UserData).filter(UserData.user_id == user_data.user_id).first()
+            existing_data = (
+                self.db.query(UserData)
+                .filter(UserData.user_id == user_data.user_id)
+                .first()
+            )
             if existing_data:
-                raise HTTPException(status_code=409, detail=f"User data already exists for user {user_data.user_id}")
+                raise HTTPException(
+                    status_code=409,
+                    detail=f"User data already exists for user {user_data.user_id}",
+                )
 
             # Create new user data
             db_user_data = UserData(**user_data.model_dump())
@@ -56,13 +67,19 @@ def create_user_data(self, user_data: UserDataCreateRequest) -> UserDataResponse
             self.logger.error(f"Error creating user data: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
 
-    def update_user_data_by_user_id(self, user_id: UUID, user_data: UserDataUpdateRequest) -> UserDataResponse:
+    def update_user_data_by_user_id(
+        self, user_id: UUID, user_data: UserDataUpdateRequest
+    ) -> UserDataResponse:
         """Update user data for a user"""
         try:
             # Get existing user data
-            db_user_data = self.db.query(UserData).filter(UserData.user_id == user_id).first()
+            db_user_data = (
+                self.db.query(UserData).filter(UserData.user_id == user_id).first()
+            )
             if not db_user_data:
-                raise HTTPException(status_code=404, detail=f"User data for user {user_id} not found")
+                raise HTTPException(
+                    status_code=404, detail=f"User data for user {user_id} not found"
+                )
 
             # Update only provided fields
             update_data = user_data.model_dump(exclude_unset=True)
@@ -84,9 +101,14 @@ def update_user_data_by_user_id(self, user_id: UUID, user_data: UserDataUpdateRe
     def delete_user_data_by_id(self, user_data_id: UUID):
         """Delete user data by its ID"""
         try:
-            user_data = self.db.query(UserData).filter(UserData.id == user_data_id).first()
+            user_data = (
+                self.db.query(UserData).filter(UserData.id == user_data_id).first()
+            )
             if not user_data:
-                raise HTTPException(status_code=404, detail=f"User data with id {user_data_id} not found")
+                raise HTTPException(
+                    status_code=404,
+                    detail=f"User data with id {user_data_id} not found",
+                )
 
             self.db.delete(user_data)
             self.db.commit()
@@ -101,9 +123,13 @@ def delete_user_data_by_id(self, user_data_id: UUID):
     def delete_user_data_by_user_id(self, user_id: UUID):
         """Delete user data by user ID"""
         try:
-            user_data = self.db.query(UserData).filter(UserData.user_id == user_id).first()
+            user_data = (
+                self.db.query(UserData).filter(UserData.user_id == user_id).first()
+            )
             if not user_data:
-                raise HTTPException(status_code=404, detail=f"User data for user {user_id} not found")
+                raise HTTPException(
+                    status_code=404, detail=f"User data for user {user_id} not found"
+                )
 
             self.db.delete(user_data)
             self.db.commit()
@@ -113,4 +139,4 @@ def delete_user_data_by_user_id(self, user_id: UUID):
         except Exception as e:
             self.db.rollback()
             self.logger.error(f"Error deleting user data: {str(e)}")
-            raise HTTPException(status_code=500, detail=str(e)) 
+            raise HTTPException(status_code=500, detail=str(e))

backend/migrations/versions/d3e4f5g6h7i8_add_user_data_table_for_storing_user_matching_parameters.py

@@ -46,14 +46,17 @@ def upgrade() -> None:
         sa.Column("treatment", sa.Text(), nullable=True),
         sa.Column("experience", sa.Text(), nullable=True),
         sa.Column("preferences", sa.Text(), nullable=True),
-        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["users.id"],
+        ),
         sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("user_id")
+        sa.UniqueConstraint("user_id"),
     )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table("user_data")
-    # ### end Alembic commands ### 
+    # ### end Alembic commands ###