participant intake form for backend is complete, still need to add in processing in backend for volunteer intakes

Author: YashK2005

backend/app/models/UserData.py

@@ -1,5 +1,5 @@
 import uuid
-from sqlalchemy import Column, Date, String, Table, ForeignKey, Integer
+from sqlalchemy import Column, Date, String, Table, ForeignKey, Integer, Text, JSON
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 
@@ -20,16 +20,72 @@
     Column("experience_id", Integer, ForeignKey("experiences.id"))
 )
 
+# Bridge tables for loved one many-to-many relationships
+user_loved_one_treatments = Table(
+    "user_loved_one_treatments",
+    Base.metadata,
+    Column("user_data_id", UUID(as_uuid=True), ForeignKey("user_data.id")),
+    Column("treatment_id", Integer, ForeignKey("treatments.id"))
+)
+
+user_loved_one_experiences = Table(
+    "user_loved_one_experiences", 
+    Base.metadata,
+    Column("user_data_id", UUID(as_uuid=True), ForeignKey("user_data.id")),
+    Column("experience_id", Integer, ForeignKey("experiences.id"))
+)
+
 
 class UserData(Base):
     __tablename__ = "user_data"
 
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    # Single-valued fields
+    
+    # Personal Information
+    first_name = Column(String(80), nullable=True)
+    last_name = Column(String(80), nullable=True)
     date_of_birth = Column(Date, nullable=True)
     email = Column(String(120), nullable=True)
     phone = Column(String(20), nullable=True)
+    city = Column(String(100), nullable=True)
+    province = Column(String(50), nullable=True)
+    postal_code = Column(String(10), nullable=True)
+    
+    # Demographics
+    gender_identity = Column(String(50), nullable=True)
+    pronouns = Column(JSON, nullable=True)  # Array of strings
+    ethnic_group = Column(JSON, nullable=True)  # Array of strings
+    marital_status = Column(String(50), nullable=True)
+    has_kids = Column(String(10), nullable=True)
+    
+    # Cancer Experience
+    diagnosis = Column(String(100), nullable=True)
+    date_of_diagnosis = Column(Date, nullable=True)
+    
+    # "Other" text fields for custom entries
+    other_treatment = Column(Text, nullable=True)
+    other_experience = Column(Text, nullable=True)
+    other_ethnic_group = Column(Text, nullable=True)
+    gender_identity_custom = Column(Text, nullable=True)
+    
+    # Flow control fields
+    has_blood_cancer = Column(String(10), nullable=True)
+    caring_for_someone = Column(String(10), nullable=True)
+    
+    # Loved One Demographics
+    loved_one_gender_identity = Column(String(50), nullable=True)
+    loved_one_age = Column(String(10), nullable=True)
+    
+    # Loved One Cancer Experience
+    loved_one_diagnosis = Column(String(100), nullable=True)
+    loved_one_date_of_diagnosis = Column(Date, nullable=True)
+    loved_one_other_treatment = Column(Text, nullable=True)
+    loved_one_other_experience = Column(Text, nullable=True)
 
     # Many-to-many relationships
     treatments = relationship("Treatment", secondary=user_treatments, back_populates="users")
-    experiences = relationship("Experience", secondary=user_experiences, back_populates="users") 
+    experiences = relationship("Experience", secondary=user_experiences, back_populates="users")
+    
+    # Loved one many-to-many relationships
+    loved_one_treatments = relationship("Treatment", secondary=user_loved_one_treatments)
+    loved_one_experiences = relationship("Experience", secondary=user_loved_one_experiences) 

backend/app/routes/intake.py

@@ -10,6 +10,7 @@
 from app.schemas.user import UserRole
 from app.models import FormSubmission, Form, User
 from app.utilities.db_utils import get_db
+from app.services.implementations.intake_form_processor import IntakeFormProcessor
 
 # ===== Schemas =====
 
@@ -48,8 +49,6 @@ def is_owner_or_admin(user_id: UUID):
     Custom dependency that checks if the current user is either:
     1. The owner of the resource (matching user_id)
     2. An admin
-    
-    This allows users to access their own data while admins can access everything.
     """
     async def validator(
         request: Request,
@@ -58,24 +57,16 @@ async def validator(
     ) -> bool:
         # Get current user info from request state (set by auth middleware)
         current_user_auth_id = request.state.user_id
-        
-        # Get the current user from database
         current_user = db.query(User).filter(User.auth_id == current_user_auth_id).first()
+        
         if not current_user:
             raise HTTPException(status_code=401, detail="User not found")
 
-        # Check if user is admin (role_id 3)
-        if current_user.role_id == 3:  # Admin role
-            return True
-        
-        # Check if user is the owner
-        if str(current_user.id) == str(user_id):
+        # Check if user is admin or the owner of the resource
+        if current_user.role.name == "admin" or current_user.id == user_id:
             return True
 
-        raise HTTPException(
-            status_code=403,
-            detail="Access denied: You can only access your own submissions"
-        )
+        raise HTTPException(status_code=403, detail="Access denied")
 
     return Depends(validator)
 
@@ -98,7 +89,7 @@ async def create_form_submission(
     authorized: bool = has_roles([UserRole.ADMIN, UserRole.PARTICIPANT, UserRole.VOLUNTEER])
 ):
     """
-    Create a new form submission.
+    Create a new form submission and process it into structured data.
     
     Users can only create submissions for themselves.
     """
@@ -117,14 +108,24 @@ async def create_form_submission(
         if not form:
             raise HTTPException(status_code=404, detail="Intake form not found")
 
-        # Create the submission
+        # Create the raw form submission record
         db_submission = FormSubmission(
             form_id=submission.form_id,
             user_id=current_user.id,  # Always use the current user's ID
             answers=submission.answers
         )
 
         db.add(db_submission)
+        db.flush()  # Get the submission ID without committing
+        
+        # Process the form data into structured tables
+        processor = IntakeFormProcessor(db)
+        user_data = processor.process_form_submission(
+            user_id=str(current_user.id), 
+            form_data=submission.answers
+        )
+        
+        # Commit everything together
         db.commit()
         db.refresh(db_submission)
 
@@ -134,7 +135,7 @@ async def create_form_submission(
         raise
     except Exception as e:
         db.rollback()
-        raise HTTPException(status_code=500, detail=str(e))
+        raise HTTPException(status_code=500, detail=f"Error processing form submission: {str(e)}")
 
 
 @router.get("/submissions", response_model=FormSubmissionListResponse)
@@ -326,4 +327,4 @@ async def get_intake_forms(
         ]
 
     except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e)) 
+        raise HTTPException(status_code=500, detail=str(e))