Assign users to tasks

src/backend/app/db/models.py

@@ -25,7 +25,7 @@
 from datetime import timedelta
 from io import BytesIO
 from re import sub
-from typing import TYPE_CHECKING, Annotated, Optional, Self
+from typing import TYPE_CHECKING, Annotated, List, Optional, Self
 from uuid import UUID
 
 import geojson
@@ -839,7 +839,7 @@ async def create(
                         u.profile_img
                     FROM inserted
                     JOIN users u ON u.id = inserted.user_id;
-            """,
+                """,
                 model_dump,
             )
             new_task_event = await cur.fetchone()
@@ -854,6 +854,51 @@ async def create(
         return new_task_event
 
 
+class DbTaskAssignment(BaseModel):
+    """Table task_assignments."""
+
+    project_id: int
+    task_id: int
+    user_id: Annotated[Optional[int], Field(gt=0)] = None
+    assigned_at: Optional[AwareDatetime] = None
+
+    @classmethod
+    async def create(
+        cls, db: Connection, project_id: int, task_id: int, user_ids: List[int]
+    ):
+        """Create new task assignments for multiple users."""
+        print("user_ids in task assignments", user_ids)
+        async with db.cursor(row_factory=class_row(cls)) as cur:
+            await cur.executemany(
+                """
+                    INSERT INTO public.task_assignments (project_id, task_id, user_id)
+                    VALUES (%(project_id)s, %(task_id)s, %(user_id)s)
+                    ON CONFLICT (task_id, user_id) DO NOTHING;
+                """,
+                [
+                    {"project_id": project_id, "task_id": task_id, "user_id": user_id}
+                    for user_id in user_ids
+                ],
+            )
+
+    @classmethod
+    async def get(cls, db: Connection, project_id: int, task_id: int):
+        """Get task assignment by task ID."""
+        async with db.cursor(row_factory=class_row(cls)) as cur:
+            await cur.execute(
+                """
+                SELECT * FROM public.task_assignments
+                WHERE project_id = %(project_id)s
+                AND task_id = %(task_id)s
+                """,
+                {
+                    "task_id": task_id,
+                    "project_id": project_id,
+                },
+            )
+            return await cur.fetchall()
+
+
 class DbTask(BaseModel):
     """Table tasks."""
 

src/backend/app/tasks/task_routes.py

@@ -17,7 +17,7 @@
 #
 """Routes for FMTM tasks."""
 
-from typing import Annotated
+from typing import Annotated, List, Optional
 
 from fastapi import APIRouter, Depends, HTTPException
 from loguru import logger as log
@@ -26,8 +26,8 @@
 from app.auth.auth_schemas import ProjectUserDict
 from app.auth.roles import mapper, super_admin
 from app.db.database import db_conn
-from app.db.enums import HTTPStatus
-from app.db.models import DbTask, DbTaskEvent, DbUser
+from app.db.enums import HTTPStatus, TaskEvent
+from app.db.models import DbTask, DbTaskAssignment, DbTaskEvent, DbUser
 from app.tasks import task_crud, task_schemas
 
 router = APIRouter(
@@ -95,16 +95,55 @@ async def add_new_task_event(
     new_event: task_schemas.TaskEventIn,
     project_user: Annotated[ProjectUserDict, Depends(mapper)],
     db: Annotated[Connection, Depends(db_conn)],
+    assignee_id: Optional[int] = None,
 ):
     """Add a new event to the events table / update task status."""
     user_id = project_user.get("user").id
     log.info(f"Task {task_id} event: {new_event.event.name} (by user {user_id})")
 
     new_event.user_id = user_id
     new_event.task_id = task_id
+    if new_event.event == TaskEvent.ASSIGN:
+        if not assignee_id:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="Assignee ID is required for ASSIGN event",
+            )
+        project_id = project_user.get("project").id
+
+        # NOTE: This will save the assigned user instead of current user if event is
+        # ASSIGN to avoid adding a new field for it
+        new_event.user_id = assignee_id
+        await DbTaskAssignment.create(db, project_id, task_id, [assignee_id])
     return await DbTaskEvent.create(db, new_event)
 
 
+@router.get(
+    "/{task_id}/assignments", response_model=list[task_schemas.TaskAssignmentOut]
+)
+async def get_task_assignments(
+    task_id: int,
+    project_user: Annotated[ProjectUserDict, Depends(mapper)],
+    db: Annotated[Connection, Depends(db_conn)],
+):
+    """Get all task assignments for a task."""
+    project_id = project_user.get("project").id
+    return await DbTaskAssignment.get(db, project_id, task_id)
+
+
+@router.post("/{task_id}/assignments")
+async def assign_to_task(
+    task_id: int,
+    project_user: Annotated[ProjectUserDict, Depends(mapper)],
+    db: Annotated[Connection, Depends(db_conn)],
+    user_ids: List[int],
+):
+    """Get all task assignments for a task."""
+    project_id = project_user.get("project").id
+    await DbTaskAssignment.create(db, project_id, task_id, user_ids)
+    return {"message": "Users have been assigned to the task successfully."}
+
+
 @router.get("/{task_id}/history", response_model=list[task_schemas.TaskEventOut])
 async def get_task_event_history(
     task_id: int,

src/backend/app/tasks/task_schemas.py

@@ -21,7 +21,7 @@
 from uuid import UUID
 
 from geojson_pydantic import Polygon
-from pydantic import BaseModel, Field
+from pydantic import AwareDatetime, BaseModel, Field
 
 from app.db.enums import MappingState
 from app.db.models import DbTask, DbTaskEvent
@@ -64,3 +64,12 @@ class TaskEventCount(BaseModel):
     date: str
     mapped: int
     validated: int
+
+
+class TaskAssignmentOut(BaseModel):
+    """Task assignments."""
+
+    project_id: int
+    task_id: int
+    user_id: int
+    assigned_at: AwareDatetime

src/backend/migrations/009-task-assignments.sql

@@ -0,0 +1,44 @@
+-- Begin transaction
+BEGIN;
+
+-- Create task_assignments table only if it does not exist
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'task_assignments') THEN
+        CREATE TABLE public.task_assignments (
+            project_id INTEGER NOT NULL,
+            task_id INTEGER NOT NULL,
+            user_id INTEGER NOT NULL,
+            assigned_at TIMESTAMPTZ NOT NULL DEFAULT now()
+        );
+        ALTER TABLE public.task_assignments OWNER TO fmtm;
+    END IF;
+END$$;
+
+-- Add primary key constraint if it does not exist
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE table_name = 'task_assignments' AND constraint_name = 'task_assignments_pkey') THEN
+        ALTER TABLE ONLY public.task_assignments
+        ADD CONSTRAINT task_assignments_pkey PRIMARY KEY (task_id, user_id);
+    END IF;
+END$$;
+
+-- Add foreign key constraints if they do not exist
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE table_name = 'task_assignments' AND constraint_name = 'task_assignments_user_id_fkey') THEN
+        ALTER TABLE ONLY public.task_assignments
+        ADD CONSTRAINT task_assignments_user_id_fkey FOREIGN KEY (user_id)
+        REFERENCES public.users (id) ON DELETE CASCADE;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE table_name = 'task_assignments' AND constraint_name = 'task_assignments_project_id_fkey') THEN
+        ALTER TABLE public.task_assignments
+        ADD CONSTRAINT task_assignments_project_id_fkey FOREIGN KEY (project_id)
+        REFERENCES public.projects (id) ON DELETE CASCADE;
+    END IF;
+END$$;
+
+-- Commit transaction
+COMMIT;

src/backend/migrations/init/fmtm_base_schema.sql

@@ -398,6 +398,14 @@ CREATE TABLE public.geometrylog (
 );
 ALTER TABLE public.geometrylog OWNER TO fmtm;
 
+CREATE TABLE public.task_assignments (
+    project_id INTEGER NOT NULL,
+    task_id INTEGER NOT NULL,
+    user_id INTEGER NOT NULL,
+    assigned_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+ALTER TABLE public.task_assignments OWNER TO fmtm;
+
 -- nextval for primary keys (autoincrement)
 
 ALTER TABLE ONLY public.organisations ALTER COLUMN id SET DEFAULT nextval(
@@ -467,6 +475,9 @@ ADD CONSTRAINT xlsforms_title_key UNIQUE (title);
 ALTER TABLE ONLY public.geometrylog
 ADD CONSTRAINT geometrylog_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY public.task_assignments
+ADD CONSTRAINT task_assignments_pkey PRIMARY KEY (task_id, user_id);
+
 -- Indexing
 
 CREATE INDEX idx_projects_outline ON public.projects USING gist (outline);
@@ -567,6 +578,13 @@ ADD CONSTRAINT user_roles_user_id_fkey FOREIGN KEY (
     user_id
 ) REFERENCES public.users (id);
 
+ALTER TABLE ONLY public.task_assignments
+ADD CONSTRAINT task_assignments_user_id_fkey FOREIGN KEY (user_id)
+REFERENCES public.users (id) ON DELETE CASCADE;
+
+ALTER TABLE public.task_assignments
+ADD CONSTRAINT task_assignments_project_id_fkey FOREIGN KEY (project_id)
+REFERENCES public.projects (id) ON DELETE CASCADE;
 -- Triggers
 
 CREATE OR REPLACE FUNCTION public.set_task_state()