fix

Author: YashK2005

backend/app/schemas/task.py

@@ -106,6 +106,7 @@ class TaskResponse(BaseModel):
     participant_id: Optional[UUID]
     participant_name: Optional[str] = None
     participant_email: Optional[str] = None
+    participant_role_id: Optional[int] = None
     type: TaskType
     priority: TaskPriority
     status: TaskStatus

backend/app/services/implementations/task_service.py

@@ -78,11 +78,13 @@ async def get_task_by_id(self, task_id: UUID) -> TaskResponse:
             # Extract participant and assignee names
             participant_name = None
             participant_email = None
+            participant_role_id = None
             if task.participant:
                 first_name = task.participant.first_name or ""
                 last_name = task.participant.last_name or ""
                 participant_name = f"{first_name} {last_name}".strip() or task.participant.email
                 participant_email = task.participant.email
+                participant_role_id = task.participant.role_id
 
             assignee_name = None
             assignee_email = None
@@ -97,6 +99,7 @@ async def get_task_by_id(self, task_id: UUID) -> TaskResponse:
                 **{c.name: getattr(task, c.name) for c in task.__table__.columns},
                 "participant_name": participant_name,
                 "participant_email": participant_email,
+                "participant_role_id": participant_role_id,
                 "assignee_name": assignee_name,
                 "assignee_email": assignee_email,
             }
@@ -151,14 +154,16 @@ async def get_all_tasks(
             # Build TaskResponse with participant and assignee names
             task_responses = []
             for task in tasks:
-                # Extract participant name and email if available
+                # Extract participant name, email, and role_id if available
                 participant_name = None
                 participant_email = None
+                participant_role_id = None
                 if task.participant:
                     first_name = task.participant.first_name or ""
                     last_name = task.participant.last_name or ""
                     participant_name = f"{first_name} {last_name}".strip() or task.participant.email
                     participant_email = task.participant.email
+                    participant_role_id = task.participant.role_id
 
                 # Extract assignee name and email if available
                 assignee_name = None
@@ -174,6 +179,7 @@ async def get_all_tasks(
                     **{c.name: getattr(task, c.name) for c in task.__table__.columns},
                     "participant_name": participant_name,
                     "participant_email": participant_email,
+                    "participant_role_id": participant_role_id,
                     "assignee_name": assignee_name,
                     "assignee_email": assignee_email,
                 }

frontend/src/APIClients/taskAPIClient.ts

@@ -5,6 +5,7 @@ export interface BackendTask {
   participantId: string | null;
   participantName: string | null;
   participantEmail: string | null;
+  participantRoleId: number | null;
   type: 'intake_form_review' | 'volunteer_app_review' | 'profile_update' | 'matching';
   priority: 'no_status' | 'low' | 'medium' | 'high';
   status: 'pending' | 'in_progress' | 'completed';

frontend/src/pages/admin/tasks.tsx

@@ -116,9 +116,14 @@ const mapAPITaskToFrontend = (
       ? `${participant.firstName || ''} ${participant.lastName || ''}`.trim() || participant.email
       : 'Unknown Participant';
 
-  // Determine user type from participant's role (default to Participant if not available)
+  // Determine user type from participant's role
+  // Use role_id from API response if available, otherwise fall back to participant object
   const userType: 'Participant' | 'Volunteer' =
-    participant && participant.roleId === 2 ? 'Volunteer' : 'Participant';
+    apiTask.participantRoleId === 2
+      ? 'Volunteer'
+      : participant && participant.roleId === 2
+        ? 'Volunteer'
+        : 'Participant';
 
   return {
     id: apiTask.id,