From 4d664d1d7279fce915edbc6d84d38475e9c05fd3 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Thu, 17 Oct 2024 10:54:33 +0545
Subject: [PATCH 01/22] feat: update role coumn in use profilem, now role will
 be store in array

---
 src/backend/app/db/db_models.py               |  3 +-
 .../app/migrations/versions/b36a13183a83_.py  | 47 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 src/backend/app/migrations/versions/b36a13183a83_.py

diff --git a/src/backend/app/db/db_models.py b/src/backend/app/db/db_models.py
index 8a38d19f..e34d5424 100644
--- a/src/backend/app/db/db_models.py
+++ b/src/backend/app/db/db_models.py
@@ -277,7 +277,8 @@ class GroundControlPoint(Base):
 class DbUserProfile(Base):
     __tablename__ = "user_profile"
     user_id = cast(str, Column(String, ForeignKey("users.id"), primary_key=True))
-    role = cast(UserRole, Column(Enum(UserRole), default=UserRole.DRONE_PILOT))
+    role = cast(list, Column(ARRAY(Enum(UserRole))))
+    # role = cast(UserRole, Column(Enum(UserRole), default=UserRole.DRONE_PILOT))
     phone_number = cast(str, Column(String))
     country = cast(str, Column(String))
     city = cast(str, Column(String))
diff --git a/src/backend/app/migrations/versions/b36a13183a83_.py b/src/backend/app/migrations/versions/b36a13183a83_.py
new file mode 100644
index 00000000..cc8fcb08
--- /dev/null
+++ b/src/backend/app/migrations/versions/b36a13183a83_.py
@@ -0,0 +1,47 @@
+from typing import Sequence, Union
+from alembic import op
+from app.models.enums import UserRole
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.sql import text
+
+
+# revision identifiers, used by Alembic.
+revision: str = "b36a13183a83"
+down_revision: Union[str, None] = "5235ef4afa9c"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+def upgrade() -> None:
+    # Check if the enum type 'userrole' already exists
+    conn = op.get_bind()
+    result = conn.execute(text("SELECT 1 FROM pg_type WHERE typname = 'userrole';")).scalar()
+
+    if not result:
+        # Create a new enum type for user roles if it doesn't exist
+        userrole_enum = sa.Enum(UserRole, name="userrole")
+        userrole_enum.create(op.get_bind())
+
+    # Change the column from a single enum value to an array of enums
+    # We need to cast each enum value to text and back to an array of enums
+    op.alter_column("user_profile", "role", 
+                    existing_type=sa.Enum(UserRole, name="userrole"), 
+                    type_=sa.ARRAY(postgresql.ENUM("PROJECT_CREATOR", "DRONE_PILOT", name="userrole")), 
+                    postgresql_using="ARRAY[role]::userrole[]",  # Convert the single enum to an array
+                    nullable=True)
+
+def downgrade() -> None:
+    # Change the column back from an array to a single enum value
+    op.alter_column("user_profile", "role", 
+                    existing_type=sa.ARRAY(postgresql.ENUM("PROJECT_CREATOR", "DRONE_PILOT", name="userrole")), 
+                    type_=sa.Enum(UserRole, name="userrole"), 
+                    postgresql_using="role[1]", 
+                    nullable=True)
+
+    # Drop the enum type only if it exists
+    conn = op.get_bind()
+    result = conn.execute(text("SELECT 1 FROM pg_type WHERE typname = 'userrole';")).scalar()
+
+    if result:
+        userrole_enum = sa.Enum(UserRole, name="userrole")
+        userrole_enum.drop(op.get_bind())

From b6852f2bf0ebe8f033928e54cf1b0a9544d8b348 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Thu, 17 Oct 2024 12:20:54 +0545
Subject: [PATCH 02/22] fix: fix role issues of user in profile update endpoint

---
 .../app/migrations/versions/b36a13183a83_.py  | 40 +++++---
 src/backend/app/users/user_schemas.py         | 91 ++++++++++++++++++-
 2 files changed, 115 insertions(+), 16 deletions(-)

diff --git a/src/backend/app/migrations/versions/b36a13183a83_.py b/src/backend/app/migrations/versions/b36a13183a83_.py
index cc8fcb08..78ce2cee 100644
--- a/src/backend/app/migrations/versions/b36a13183a83_.py
+++ b/src/backend/app/migrations/versions/b36a13183a83_.py
@@ -12,10 +12,13 @@
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
+
 def upgrade() -> None:
     # Check if the enum type 'userrole' already exists
     conn = op.get_bind()
-    result = conn.execute(text("SELECT 1 FROM pg_type WHERE typname = 'userrole';")).scalar()
+    result = conn.execute(
+        text("SELECT 1 FROM pg_type WHERE typname = 'userrole';")
+    ).scalar()
 
     if not result:
         # Create a new enum type for user roles if it doesn't exist
@@ -24,23 +27,36 @@ def upgrade() -> None:
 
     # Change the column from a single enum value to an array of enums
     # We need to cast each enum value to text and back to an array of enums
-    op.alter_column("user_profile", "role", 
-                    existing_type=sa.Enum(UserRole, name="userrole"), 
-                    type_=sa.ARRAY(postgresql.ENUM("PROJECT_CREATOR", "DRONE_PILOT", name="userrole")), 
-                    postgresql_using="ARRAY[role]::userrole[]",  # Convert the single enum to an array
-                    nullable=True)
+    op.alter_column(
+        "user_profile",
+        "role",
+        existing_type=sa.Enum(UserRole, name="userrole"),
+        type_=sa.ARRAY(
+            postgresql.ENUM("PROJECT_CREATOR", "DRONE_PILOT", name="userrole")
+        ),
+        postgresql_using="ARRAY[role]::userrole[]",  # Convert the single enum to an array
+        nullable=True,
+    )
+
 
 def downgrade() -> None:
     # Change the column back from an array to a single enum value
-    op.alter_column("user_profile", "role", 
-                    existing_type=sa.ARRAY(postgresql.ENUM("PROJECT_CREATOR", "DRONE_PILOT", name="userrole")), 
-                    type_=sa.Enum(UserRole, name="userrole"), 
-                    postgresql_using="role[1]", 
-                    nullable=True)
+    op.alter_column(
+        "user_profile",
+        "role",
+        existing_type=sa.ARRAY(
+            postgresql.ENUM("PROJECT_CREATOR", "DRONE_PILOT", name="userrole")
+        ),
+        type_=sa.Enum(UserRole, name="userrole"),
+        postgresql_using="role[1]",
+        nullable=True,
+    )
 
     # Drop the enum type only if it exists
     conn = op.get_bind()
-    result = conn.execute(text("SELECT 1 FROM pg_type WHERE typname = 'userrole';")).scalar()
+    result = conn.execute(
+        text("SELECT 1 FROM pg_type WHERE typname = 'userrole';")
+    ).scalar()
 
     if result:
         userrole_enum = sa.Enum(UserRole, name="userrole")
diff --git a/src/backend/app/users/user_schemas.py b/src/backend/app/users/user_schemas.py
index 0ff79814..a55d0bfd 100644
--- a/src/backend/app/users/user_schemas.py
+++ b/src/backend/app/users/user_schemas.py
@@ -2,7 +2,7 @@
 from app.models.enums import HTTPStatus, State, UserRole
 from pydantic import BaseModel, EmailStr, ValidationInfo, Field
 from pydantic.functional_validators import field_validator
-from typing import Optional
+from typing import List, Optional
 from psycopg import Connection
 from psycopg.rows import class_row
 import psycopg
@@ -95,20 +95,31 @@ class BaseUserProfile(BaseModel):
     drone_you_own: Optional[str] = None
     experience_years: Optional[int] = None
     certified_drone_operator: Optional[bool] = False
-    role: Optional[UserRole] = None
+    role: Optional[List[UserRole]] = None
 
     @field_validator("role", mode="after")
     @classmethod
     def integer_role_to_string(cls, value: UserRole):
+        if isinstance(value, list):
+            value = [str(role.name) for role in value]
+
         if isinstance(value, int):
             value = UserRole(value)
-        return str(value.name)
+
+        unique_roles = set(value)
+        value = list(unique_roles)
+        return value
 
     @field_validator("role", mode="before")
     @classmethod
     def srting_role_to_integer(cls, value: UserRole) -> str:
         if isinstance(value, str):
-            value = UserRole[value].value
+            role_list = value.strip("{}").split(",")
+            value = [
+                UserRole[role.strip()].value
+                for role in role_list
+                if role.strip() in UserRole.__members__
+            ]
         return value
 
 
@@ -130,6 +141,26 @@ async def update(db: Connection, user_id: int, profile_update: UserProfileIn):
         model_dump = profile_update.model_dump(
             exclude_none=True, exclude=["password", "old_password"]
         )
+
+        # If there are new roles, update the existing roles
+        if "role" in model_dump and model_dump["role"] is not None:
+            new_roles = model_dump["role"]
+
+            # Create a query to update roles
+            role_update_query = """
+                UPDATE user_profile
+                SET role = (
+                    SELECT ARRAY(
+                        SELECT DISTINCT unnest(array_cat(role, %s))
+                    )
+                )
+                WHERE user_id = %s;
+            """
+
+            async with db.cursor() as cur:
+                await cur.execute(role_update_query, (new_roles, user_id))
+
+        # Prepare the columns and placeholders for the main update
         columns = ", ".join(model_dump.keys())
         value_placeholders = ", ".join(f"%({key})s" for key in model_dump.keys())
         sql = f"""
@@ -169,6 +200,58 @@ async def update(db: Connection, user_id: int, profile_update: UserProfileIn):
                 )
             return True
 
+    # class DbUserProfile(BaseUserProfile):
+    #     """UserProfile model for interacting with the user_profile table."""
+
+    #     user_id: int
+
+    #     @staticmethod
+    #     async def update(db: Connection, user_id: int, profile_update: UserProfileIn):
+    #         """Update or insert a user profile."""
+
+    #         # Prepare data for insert or update
+    #         model_dump = profile_update.model_dump(
+    #             exclude_none=True, exclude=["password", "old_password"]
+    #         )
+    #         columns = ", ".join(model_dump.keys())
+    #         value_placeholders = ", ".join(f"%({key})s" for key in model_dump.keys())
+    #         sql = f"""
+    #             INSERT INTO user_profile (
+    #                 user_id, {columns}
+    #             )
+    #             VALUES (
+    #                 %(user_id)s, {value_placeholders}
+    #             )
+    #             ON CONFLICT (user_id)
+    #             DO UPDATE SET
+    #                 {', '.join(f"{key} = EXCLUDED.{key}" for key in model_dump.keys())};
+    #         """
+
+    #         # Prepare password update query if a new password is provided
+    #         password_update_query = """
+    #             UPDATE users
+    #             SET password = %(password)s
+    #             WHERE id = %(user_id)s;
+    #         """
+
+    #         model_dump["user_id"] = user_id
+
+    #         async with db.cursor() as cur:
+    #             await cur.execute(sql, model_dump)
+
+    #             if profile_update.password:
+    #                 # Update password if provided
+    #                 await cur.execute(
+    #                     password_update_query,
+    #                     {
+    #                         "password": user_logic.get_password_hash(
+    #                             profile_update.password
+    #                         ),
+    #                         "user_id": user_id,
+    #                     },
+    #                 )
+    #             return True
+
     async def get_userprofile_by_userid(db: Connection, user_id: str):
         """Fetch the user profile by user ID."""
         query = """

From 505aeb70616c56dedb02c6019921618f9f382206 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Thu, 17 Oct 2024 12:56:03 +0545
Subject: [PATCH 03/22] feat: added new endpoints for project centroids

---
 src/backend/app/projects/project_logic.py  | 14 ++++++++++++++
 src/backend/app/projects/project_routes.py | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/backend/app/projects/project_logic.py b/src/backend/app/projects/project_logic.py
index f9a91bf7..1d8ba785 100644
--- a/src/backend/app/projects/project_logic.py
+++ b/src/backend/app/projects/project_logic.py
@@ -19,6 +19,20 @@
 from app.projects.image_processing import DroneImageProcessor
 from app.projects import project_schemas
 from minio import S3Error
+from psycopg.rows import dict_row
+
+
+async def get_centroids(db: Connection):
+    try:
+        async with db.cursor(row_factory=dict_row) as cur:
+            await cur.execute(
+                """SELECT ST_AsGeoJSON(centroid)::jsonb AS centroid FROM projects"""
+            )
+            centroids = await cur.fetchall()
+
+            return centroids
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
 
 
 async def upload_file_to_s3(
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 9bbbf841..2aab3752 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -42,6 +42,26 @@
 )
 
 
+@router.get("/centroids", tags=["Projects"])
+async def read_project_centroids(
+    db: Annotated[Connection, Depends(database.get_db)],
+    user_data: Annotated[AuthUser, Depends(login_required)]
+):
+    """
+    Get all project centroids.
+    """
+    try:
+        centroids = await project_logic.get_centroids(
+            db,
+        )
+        if not centroids:
+            return []
+
+        return centroids
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 @router.get("/{project_id}/download-boundaries", tags=["Projects"])
 async def download_boundaries(
     project_id: Annotated[

From 73c68b426cbacf9122785ca1ee4be207d6ef4bd7 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Thu, 17 Oct 2024 13:37:51 +0545
Subject: [PATCH 04/22] feat: update status & ongoing task on project endpoint

---
 src/backend/app/projects/project_logic.py   | 24 +++++++++++++++---
 src/backend/app/projects/project_routes.py  |  6 +++--
 src/backend/app/projects/project_schemas.py | 27 +++++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/backend/app/projects/project_logic.py b/src/backend/app/projects/project_logic.py
index 1d8ba785..30b74fdd 100644
--- a/src/backend/app/projects/project_logic.py
+++ b/src/backend/app/projects/project_logic.py
@@ -25,11 +25,29 @@
 async def get_centroids(db: Connection):
     try:
         async with db.cursor(row_factory=dict_row) as cur:
-            await cur.execute(
-                """SELECT ST_AsGeoJSON(centroid)::jsonb AS centroid FROM projects"""
-            )
+            await cur.execute("""
+                SELECT
+                    p.id,
+                    p.slug,
+                    p.name,
+                    ST_AsGeoJSON(p.centroid)::jsonb AS centroid,
+                    COUNT(t.id) AS total_task_count,
+                    COUNT(CASE WHEN te.state IN ('LOCKED_FOR_MAPPING', 'REQUEST_FOR_MAPPING', 'IMAGE_UPLOADED', 'UNFLYABLE_TASK') THEN 1 END) AS ongoing_task_count,
+                    COUNT(CASE WHEN te.state = 'IMAGE_PROCESSED' THEN 1 END) AS completed_task_count
+                FROM
+                    projects p
+                LEFT JOIN
+                    tasks t ON p.id = t.project_id
+                LEFT JOIN
+                    task_events te ON t.id = te.task_id
+                GROUP BY
+                    p.id, p.slug, p.name, p.centroid;
+            """)
             centroids = await cur.fetchall()
 
+            if not centroids:
+                raise HTTPException(status_code=404, detail="No centroids found.")
+
             return centroids
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 2aab3752..f4ca8e06 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -42,10 +42,12 @@
 )
 
 
-@router.get("/centroids", tags=["Projects"])
+@router.get(
+    "/centroids", tags=["Projects"], response_model=list[project_schemas.CentroidOut]
+)
 async def read_project_centroids(
     db: Annotated[Connection, Depends(database.get_db)],
-    user_data: Annotated[AuthUser, Depends(login_required)]
+    # user_data: Annotated[AuthUser, Depends(login_required)],
 ):
     """
     Get all project centroids.
diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py
index 42986800..ce2e51f7 100644
--- a/src/backend/app/projects/project_schemas.py
+++ b/src/backend/app/projects/project_schemas.py
@@ -26,6 +26,33 @@
 from app.s3 import get_presigned_url
 
 
+class CentroidOut(BaseModel):
+    id: uuid.UUID
+    slug: str
+    name: str
+    centroid: dict
+    total_task_count: int
+    ongoing_task_count: int
+    completed_task_count: int
+    status: str = None
+
+    @model_validator(mode="after")
+    def calculate_status(cls, values):
+        """Set the project status based on task counts."""
+        ongoing_task_count = values.ongoing_task_count
+        completed_task_count = values.completed_task_count
+        total_task_count = values.total_task_count
+
+        if completed_task_count == 0 and ongoing_task_count == 0:
+            values.status = "not-started"
+        elif completed_task_count == total_task_count:
+            values.status = "completed"
+        else:
+            values.status = "ongoing"
+
+        return values
+
+
 class AssetsInfo(BaseModel):
     project_id: str
     task_id: str

From b8bef9f89af20a82e6a9c6db5471395e189873b1 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Thu, 17 Oct 2024 13:40:21 +0545
Subject: [PATCH 05/22] fix: remove unused code from update profile

---
 src/backend/app/db/db_models.py       |  1 -
 src/backend/app/users/user_schemas.py | 52 ---------------------------
 2 files changed, 53 deletions(-)

diff --git a/src/backend/app/db/db_models.py b/src/backend/app/db/db_models.py
index e34d5424..7704ceef 100644
--- a/src/backend/app/db/db_models.py
+++ b/src/backend/app/db/db_models.py
@@ -278,7 +278,6 @@ class DbUserProfile(Base):
     __tablename__ = "user_profile"
     user_id = cast(str, Column(String, ForeignKey("users.id"), primary_key=True))
     role = cast(list, Column(ARRAY(Enum(UserRole))))
-    # role = cast(UserRole, Column(Enum(UserRole), default=UserRole.DRONE_PILOT))
     phone_number = cast(str, Column(String))
     country = cast(str, Column(String))
     city = cast(str, Column(String))
diff --git a/src/backend/app/users/user_schemas.py b/src/backend/app/users/user_schemas.py
index a55d0bfd..87d4880c 100644
--- a/src/backend/app/users/user_schemas.py
+++ b/src/backend/app/users/user_schemas.py
@@ -200,58 +200,6 @@ async def update(db: Connection, user_id: int, profile_update: UserProfileIn):
                 )
             return True
 
-    # class DbUserProfile(BaseUserProfile):
-    #     """UserProfile model for interacting with the user_profile table."""
-
-    #     user_id: int
-
-    #     @staticmethod
-    #     async def update(db: Connection, user_id: int, profile_update: UserProfileIn):
-    #         """Update or insert a user profile."""
-
-    #         # Prepare data for insert or update
-    #         model_dump = profile_update.model_dump(
-    #             exclude_none=True, exclude=["password", "old_password"]
-    #         )
-    #         columns = ", ".join(model_dump.keys())
-    #         value_placeholders = ", ".join(f"%({key})s" for key in model_dump.keys())
-    #         sql = f"""
-    #             INSERT INTO user_profile (
-    #                 user_id, {columns}
-    #             )
-    #             VALUES (
-    #                 %(user_id)s, {value_placeholders}
-    #             )
-    #             ON CONFLICT (user_id)
-    #             DO UPDATE SET
-    #                 {', '.join(f"{key} = EXCLUDED.{key}" for key in model_dump.keys())};
-    #         """
-
-    #         # Prepare password update query if a new password is provided
-    #         password_update_query = """
-    #             UPDATE users
-    #             SET password = %(password)s
-    #             WHERE id = %(user_id)s;
-    #         """
-
-    #         model_dump["user_id"] = user_id
-
-    #         async with db.cursor() as cur:
-    #             await cur.execute(sql, model_dump)
-
-    #             if profile_update.password:
-    #                 # Update password if provided
-    #                 await cur.execute(
-    #                     password_update_query,
-    #                     {
-    #                         "password": user_logic.get_password_hash(
-    #                             profile_update.password
-    #                         ),
-    #                         "user_id": user_id,
-    #                     },
-    #                 )
-    #             return True
-
     async def get_userprofile_by_userid(db: Connection, user_id: str):
         """Fetch the user profile by user ID."""
         query = """

From dc5b9413bfe3c79e07472f56387e006bbe8908de Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 15:21:17 +0545
Subject: [PATCH 06/22] feat: update role text on signin/signup

---
 .../src/components/LandingPage/SignInOverlay/index.tsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx
index 9bb4b529..2b22ce23 100644
--- a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx
+++ b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx
@@ -46,7 +46,7 @@ export default function SignInOverlay() {
             className="naxatw-whitespace-nowrap !naxatw-bg-landing-red"
             rightIcon="east"
             onClick={() => {
-              localStorage.setItem('signedInAs', 'Project Creator');
+              localStorage.setItem('signedInAs', 'PROJECT_CREATOR');
               if (isAuthenticated()) {
                 navigate('/projects');
               } else {
@@ -67,7 +67,7 @@ export default function SignInOverlay() {
             className="naxatw-whitespace-nowrap !naxatw-bg-landing-red"
             rightIcon="east"
             onClick={() => {
-              localStorage.setItem('signedInAs', 'Drone Operator');
+              localStorage.setItem('signedInAs', 'DRONE_OPERATOR');
               if (isAuthenticated()) {
                 navigate('/projects');
               } else {

From 5984a3c92f68996976d47c562cbfabaa570dee87 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 15:25:38 +0545
Subject: [PATCH 07/22] feat: redirect to complete profile page if the current
 signin role is not includes in role list

---
 .../src/components/common/UserProfile/index.tsx   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/components/common/UserProfile/index.tsx b/src/frontend/src/components/common/UserProfile/index.tsx
index b64f406b..a8da0ce5 100644
--- a/src/frontend/src/components/common/UserProfile/index.tsx
+++ b/src/frontend/src/components/common/UserProfile/index.tsx
@@ -15,12 +15,21 @@ export default function UserProfile() {
 
   const { data: userDetails, isFetching }: Record<string, any> =
     useGetUserDetailsQuery();
+
   const userProfile = getLocalStorageValue('userprofile');
+  const role = localStorage.getItem('signedInAs');
 
   useEffect(() => {
-    if (userDetails?.has_user_profile || isFetching) return;
-    if (!userDetails?.has_user_profile) navigate('/complete-profile');
-  }, [userDetails?.has_user_profile, navigate, isFetching]);
+    if (userDetails?.role?.includes(role) || isFetching) return;
+    if (!userDetails?.has_user_profile || !userDetails?.role?.includes(role))
+      navigate('/complete-profile');
+  }, [
+    userDetails?.has_user_profile,
+    userDetails?.role,
+    role,
+    navigate,
+    isFetching,
+  ]);
 
   const settingOptions = [
     {

From d23227447b2e0b5e639292359e91c28445aa0126 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 15:32:57 +0545
Subject: [PATCH 08/22] feat:  update text `Drone Oprerator` to
 `DRONE_OPERATOR` and `Project Creator` to `PROJECT_CREATOR`

---
 .../src/components/Projects/ProjectsHeader/index.tsx        | 4 ++--
 .../src/components/Authentication/Login/index.tsx           | 2 +-
 src/frontend/src/views/CompleteUserProfile/index.tsx        | 6 +++---
 src/frontend/src/views/Dashboard/index.tsx                  | 6 +++---
 src/frontend/src/views/UpdateUserProfile/index.tsx          | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/frontend/src/components/Projects/ProjectsHeader/index.tsx b/src/frontend/src/components/Projects/ProjectsHeader/index.tsx
index c4761e15..c997b02c 100644
--- a/src/frontend/src/components/Projects/ProjectsHeader/index.tsx
+++ b/src/frontend/src/components/Projects/ProjectsHeader/index.tsx
@@ -13,7 +13,7 @@ import useDebounceListener from '@Hooks/useDebouncedListener';
 export default function ProjectsHeader() {
   const dispatch = useTypedDispatch();
   const navigate = useNavigate();
-  const signedInAs = localStorage.getItem('signedInAs') || 'Project Creator';
+  const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
   const showMap = useTypedSelector(state => state.common.showMap);
   const projectsFilterByOwner = useTypedSelector(
     state => state.createproject.ProjectsFilterByOwner,
@@ -75,7 +75,7 @@ export default function ProjectsHeader() {
           />
         </FlexRow>
 
-        {signedInAs === 'Project Creator' && (
+        {signedInAs === 'PROJECT_CREATOR' && (
           <Button
             variant="secondary"
             className="!naxatw-bg-red naxatw-text-white"
diff --git a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
index 32c3abc2..b33b6324 100644
--- a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
+++ b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
@@ -35,7 +35,7 @@ export default function Login() {
     return setShowPassword(prev => !prev);
   };
 
-  const signedInAs = localStorage.getItem('signedInAs') || 'Project Creator';
+  const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
 
   const { mutate, isLoading } = useMutation<any, any, any, unknown>({
     mutationFn: signInUser,
diff --git a/src/frontend/src/views/CompleteUserProfile/index.tsx b/src/frontend/src/views/CompleteUserProfile/index.tsx
index 84c16de7..198f6525 100644
--- a/src/frontend/src/views/CompleteUserProfile/index.tsx
+++ b/src/frontend/src/views/CompleteUserProfile/index.tsx
@@ -32,7 +32,7 @@ const getActiveFormContent = (
     case 1:
       return <BasicDetails formProps={formProps} />;
     case 2:
-      return userType === 'Project Creator' ? (
+      return userType === 'PROJECT_CREATOR' ? (
         <OrganizationDetails formProps={formProps} />
       ) : (
         <OtherDetails formProps={formProps} />
@@ -48,9 +48,9 @@ const CompleteUserProfile = () => {
   const dispatch = useTypedDispatch();
   const navigate = useNavigate();
   const { width } = useWindowDimensions();
-  const signedInAs = localStorage.getItem('signedInAs') || 'Project Creator';
+  const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
   const isDroneOperator =
-    localStorage.getItem('signedInAs') === 'Drone Operator';
+    localStorage.getItem('signedInAs') === 'DRONE_OPERATOR';
 
   const userProfileActiveTab = useTypedSelector(
     state => state.common.userProfileActiveTab,
diff --git a/src/frontend/src/views/Dashboard/index.tsx b/src/frontend/src/views/Dashboard/index.tsx
index c151356b..cb313867 100644
--- a/src/frontend/src/views/Dashboard/index.tsx
+++ b/src/frontend/src/views/Dashboard/index.tsx
@@ -17,9 +17,9 @@ const getContent = (activeTab: string, title: string) => {
 };
 
 const Dashboard = () => {
-  const signedInAs = localStorage.getItem('signedInAs') || 'Project Creator';
+  const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
   const [activeTab, setActiveTab] = useState(
-    signedInAs === 'Project Creator'
+    signedInAs === 'PROJECT_CREATOR'
       ? {
           value: 'request_logs',
           title: 'Request Logs',
@@ -30,7 +30,7 @@ const Dashboard = () => {
         },
   );
   const dashboardCards =
-    signedInAs === 'Project Creator'
+    signedInAs === 'PROJECT_CREATOR'
       ? dashboardCardsForProjectCreator
       : dashboardCardsForDroneOperator;
 
diff --git a/src/frontend/src/views/UpdateUserProfile/index.tsx b/src/frontend/src/views/UpdateUserProfile/index.tsx
index 3054f022..15fca0cc 100644
--- a/src/frontend/src/views/UpdateUserProfile/index.tsx
+++ b/src/frontend/src/views/UpdateUserProfile/index.tsx
@@ -16,7 +16,7 @@ const getActiveFormContent = (activeTab: number, userType: string) => {
     case 1:
       return <BasicDetails />;
     case 2:
-      return userType === 'Project Creator' ? (
+      return userType === 'PROJECT_CREATOR' ? (
         <OrganizationDetails />
       ) : (
         <OtherDetails />
@@ -35,7 +35,7 @@ const UpdateUserProfile = () => {
   const userProfileActiveTab = useTypedSelector(
     state => state.common.userProfileActiveTab,
   );
-  const signedInAs = localStorage.getItem('signedInAs') || 'Project Creator';
+  const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
 
   useEffect(() => {
     return () => {};

From c10f322e1b70f42dcfd9e359cf58be178e0c5f0a Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 15:42:06 +0545
Subject: [PATCH 09/22] feat: update role case for readability

---
 .../src/components/Dashboard/DashboardSidebar/index.tsx   | 8 ++++++--
 .../src/components/Authentication/Login/index.tsx         | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/components/Dashboard/DashboardSidebar/index.tsx b/src/frontend/src/components/Dashboard/DashboardSidebar/index.tsx
index 0f83a2b0..c7aa2dc7 100644
--- a/src/frontend/src/components/Dashboard/DashboardSidebar/index.tsx
+++ b/src/frontend/src/components/Dashboard/DashboardSidebar/index.tsx
@@ -14,7 +14,9 @@ const DashboardSidebar = () => {
         <img src={userDetails?.profile_img} alt="profile" />
       </Flex>
       <h5 className="mt-2.5">{userDetails?.name}</h5>
-      <p className="naxatw-py-1 naxatw-text-body-sm">{role}</p>
+      <p className="naxatw-py-1 naxatw-text-body-sm">
+        {role === 'PROJECT_CREATOR' ? 'Project Creator' : 'Drone Operator'}
+      </p>
       <p className="naxatw-text-body-sm">{userDetails?.email_address}</p>
 
       <Button
@@ -39,7 +41,9 @@ const DashboardSidebar = () => {
         </FlexRow>
         <FlexRow className="naxatw-justify-center naxatw-gap-1 md:naxatw-justify-normal">
           <p className="md:naxatw-min-w-[30%]">Role</p>:
-          <p className="naxatw-break-words md:naxatw-min-w-[65%]">{role}</p>
+          <p className="naxatw-break-words md:naxatw-min-w-[65%]">
+            {role === 'PROJECT_CREATOR' ? 'Project Creator' : 'Drone Operator'}
+          </p>
         </FlexRow>
       </FlexColumn>
     </FlexColumn>
diff --git a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
index b33b6324..4497d45b 100644
--- a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
+++ b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
@@ -83,7 +83,11 @@ export default function Login() {
         className="naxatw-h-screen naxatw-w-full naxatw-flex-col naxatw-items-center naxatw-justify-center"
       >
         <Image src={Person} />
-        <h3>{signedInAs}</h3>
+        <h3>
+          {signedInAs === 'PROJECT_CREATOR'
+            ? 'Project Creator'
+            : 'Drone Operator'}
+        </h3>
 
         {/* google login button */}
         <div

From a09900a15ac842506b6d92e5f0b06c8c8762bf77 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 16:12:33 +0545
Subject: [PATCH 10/22] feat: post new role with existing role on profile add
 as new role

---
 src/frontend/src/views/CompleteUserProfile/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/views/CompleteUserProfile/index.tsx b/src/frontend/src/views/CompleteUserProfile/index.tsx
index 198f6525..c8ac042e 100644
--- a/src/frontend/src/views/CompleteUserProfile/index.tsx
+++ b/src/frontend/src/views/CompleteUserProfile/index.tsx
@@ -56,6 +56,8 @@ const CompleteUserProfile = () => {
     state => state.common.userProfileActiveTab,
   );
   const userProfile = getLocalStorageValue('userprofile');
+  const existingRole = userProfile?.role?.[0] === 'PROJECT_CREATOR' ? 1 : 2;
+  const newRole = isDroneOperator ? 2 : 1;
 
   const initialState = {
     name: userProfile?.name,
@@ -74,7 +76,7 @@ const CompleteUserProfile = () => {
     experience_years: null,
     certified_drone_operator: false,
     drone_you_own: null,
-    role: isDroneOperator ? 2 : 1,
+    role: userProfile?.role ? [existingRole, newRole] : [newRole],
   };
 
   const { register, setValue, handleSubmit, formState, control, watch } =

From dedc6982c8c1e940a18b56c02dcbcc36d20ead6b Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 16:35:12 +0545
Subject: [PATCH 11/22] feat: update text `DRONE_OPERATOR` to `DRONE_PILOT`

---
 .../src/components/LandingPage/SignInOverlay/index.tsx         | 2 +-
 src/frontend/src/views/CompleteUserProfile/index.tsx           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx
index 2b22ce23..a1243e40 100644
--- a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx
+++ b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx
@@ -67,7 +67,7 @@ export default function SignInOverlay() {
             className="naxatw-whitespace-nowrap !naxatw-bg-landing-red"
             rightIcon="east"
             onClick={() => {
-              localStorage.setItem('signedInAs', 'DRONE_OPERATOR');
+              localStorage.setItem('signedInAs', 'DRONE_PILOT');
               if (isAuthenticated()) {
                 navigate('/projects');
               } else {
diff --git a/src/frontend/src/views/CompleteUserProfile/index.tsx b/src/frontend/src/views/CompleteUserProfile/index.tsx
index c8ac042e..b7f2541a 100644
--- a/src/frontend/src/views/CompleteUserProfile/index.tsx
+++ b/src/frontend/src/views/CompleteUserProfile/index.tsx
@@ -49,8 +49,7 @@ const CompleteUserProfile = () => {
   const navigate = useNavigate();
   const { width } = useWindowDimensions();
   const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
-  const isDroneOperator =
-    localStorage.getItem('signedInAs') === 'DRONE_OPERATOR';
+  const isDroneOperator = localStorage.getItem('signedInAs') === 'DRONE_PILOT';
 
   const userProfileActiveTab = useTypedSelector(
     state => state.common.userProfileActiveTab,

From f39f913bd6d2fda81bff9f2f8d1d985f1bb849d7 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 17:33:46 +0545
Subject: [PATCH 12/22] feat(project-dashboard): fetch projects centroid list

---
 src/frontend/src/api/projects.ts           | 17 ++++++++++++++++-
 src/frontend/src/services/createproject.ts |  3 +++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/api/projects.ts b/src/frontend/src/api/projects.ts
index 2a806316..12fced39 100644
--- a/src/frontend/src/api/projects.ts
+++ b/src/frontend/src/api/projects.ts
@@ -1,6 +1,10 @@
 /* eslint-disable import/prefer-default-export */
 import { UseQueryOptions, useQuery } from '@tanstack/react-query';
-import { getProjectsList, getProjectDetail } from '@Services/createproject';
+import {
+  getProjectsList,
+  getProjectDetail,
+  getProjectCentroid,
+} from '@Services/createproject';
 import { getAllAssetsUrl, getTaskStates } from '@Services/project';
 import { getUserProfileInfo } from '@Services/common';
 
@@ -73,3 +77,14 @@ export const useGetAllAssetsUrlQuery = (
     ...queryOptions,
   });
 };
+
+export const useGetProjectCentroidQuery = (
+  queryOptions?: Partial<UseQueryOptions>,
+) => {
+  return useQuery({
+    queryKey: ['all-projects-centroid'],
+    queryFn: () => getProjectCentroid(),
+    select: (data: any) => data.data,
+    ...queryOptions,
+  });
+};
diff --git a/src/frontend/src/services/createproject.ts b/src/frontend/src/services/createproject.ts
index 77462dc1..ff1fa8b1 100644
--- a/src/frontend/src/services/createproject.ts
+++ b/src/frontend/src/services/createproject.ts
@@ -17,3 +17,6 @@ export const postPreviewSplitBySquare = (data: any) =>
 
 export const postTaskBoundary = ({ id, data }: { id: number; data: any }) =>
   authenticated(api).post(`/projects/${id}/upload-task-boundaries`, data);
+
+export const getProjectCentroid = () =>
+  authenticated(api).get('/projects/centroids');

From aeff2ea494c79da95485f33fbf6d760f26e644bb Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 17:36:37 +0545
Subject: [PATCH 13/22] feat(project-dashboard): use separate api to show all
 projects (not-paginated) on map

---
 .../components/Projects/MapSection/index.tsx  | 29 ++++++++++---------
 src/frontend/src/views/Projects/index.tsx     | 15 ++++++++--
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/frontend/src/components/Projects/MapSection/index.tsx b/src/frontend/src/components/Projects/MapSection/index.tsx
index 7fc8101c..ec09654d 100644
--- a/src/frontend/src/components/Projects/MapSection/index.tsx
+++ b/src/frontend/src/components/Projects/MapSection/index.tsx
@@ -3,7 +3,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { LngLatBoundsLike, Map } from 'maplibre-gl';
 import getBbox from '@turf/bbox';
-import centroid from '@turf/centroid';
 import { FeatureCollection } from 'geojson';
 import { useMapLibreGLMap } from '@Components/common/MapLibreComponents';
 import AsyncPopup from '@Components/common/MapLibreComponents/AsyncPopup';
@@ -12,7 +11,11 @@ import MapContainer from '@Components/common/MapLibreComponents/MapContainer';
 import hasErrorBoundary from '@Utils/hasErrorBoundary';
 import VectorLayerWithCluster from './VectorLayerWithCluster';
 
-const ProjectsMapSection = ({ projectList }: { projectList: any }) => {
+const ProjectsMapSection = ({
+  projectCentroidList,
+}: {
+  projectCentroidList: Record<string, any>[];
+}) => {
   const [projectProperties, setProjectProperties] = useState<
     Record<string, any>
   >({});
@@ -27,17 +30,17 @@ const ProjectsMapSection = ({ projectList }: { projectList: any }) => {
     disableRotation: true,
   });
 
-  const projectsGeojson = useMemo(() => {
-    if (!projectList || !projectList?.length) return [];
+  const projectsCentroidGeojson: any = useMemo(() => {
+    if (!projectCentroidList || !projectCentroidList?.length) return [];
     // find all polygons centroid and set to geojson save to single geojson
-    const combinedGeojson = projectList?.reduce(
+    const combinedGeojson = projectCentroidList?.reduce(
       (acc: Record<string, any>, current: Record<string, any>) => {
         return {
           ...acc,
           features: [
             ...acc.features,
             {
-              ...centroid(current.outline),
+              geometry: current?.centroid,
               properties: {
                 id: current?.id,
                 name: current?.name,
@@ -59,19 +62,19 @@ const ProjectsMapSection = ({ projectList }: { projectList: any }) => {
       },
     );
     return combinedGeojson;
-  }, [projectList]);
+  }, [projectCentroidList]);
 
   useEffect(() => {
     if (
-      !projectsGeojson ||
-      !projectsGeojson?.features?.length ||
+      !projectsCentroidGeojson ||
+      !projectsCentroidGeojson?.features?.length ||
       !map ||
       !isMapLoaded
     )
       return;
-    const bbox = getBbox(projectsGeojson as FeatureCollection);
+    const bbox = getBbox(projectsCentroidGeojson as FeatureCollection);
     map?.fitBounds(bbox as LngLatBoundsLike, { padding: 100, duration: 500 });
-  }, [projectsGeojson, map, isMapLoaded]);
+  }, [projectsCentroidGeojson, map, isMapLoaded]);
 
   const getPopupUI = useCallback(() => {
     return (
@@ -94,13 +97,13 @@ const ProjectsMapSection = ({ projectList }: { projectList: any }) => {
     >
       <BaseLayerSwitcher />
 
-      {projectsGeojson && (
+      {projectsCentroidGeojson && (
         <VectorLayerWithCluster
           map={map}
           visibleOnMap
           mapLoaded={isMapLoaded}
           sourceId="clustered-projects"
-          geojson={projectsGeojson}
+          geojson={projectsCentroidGeojson}
         />
       )}
 
diff --git a/src/frontend/src/views/Projects/index.tsx b/src/frontend/src/views/Projects/index.tsx
index 086a761a..0b171e46 100644
--- a/src/frontend/src/views/Projects/index.tsx
+++ b/src/frontend/src/views/Projects/index.tsx
@@ -6,7 +6,10 @@ import {
   ProjectsHeader,
   ProjectsMapSection,
 } from '@Components/Projects';
-import { useGetProjectsListQuery } from '@Api/projects';
+import {
+  useGetProjectCentroidQuery,
+  useGetProjectsListQuery,
+} from '@Api/projects';
 import ProjectCardSkeleton from '@Components/Projects/ProjectCardSkeleton';
 import hasErrorBoundary from '@Utils/hasErrorBoundary';
 import { setCreateProjectState } from '@Store/actions/createproject';
@@ -44,6 +47,10 @@ const Projects = () => {
       },
     });
 
+  // fetch project centroid
+  const { data: projectCentroids, isFetching: isCentroidFetching } =
+    useGetProjectCentroidQuery();
+
   useEffect(() => {
     handlePaginationState({ activePage: 1 });
   }, [projectSearchKey, projectsFilterByOwner]);
@@ -94,8 +101,10 @@ const Projects = () => {
         </div>
         {showMap && (
           <div className="naxatw-h-[70vh] naxatw-w-full naxatw-py-2 naxatw-shadow-xl md:naxatw-h-full md:naxatw-w-1/2">
-            {!isLoading ? (
-              <ProjectsMapSection projectList={projectListData?.results} />
+            {!isCentroidFetching ? (
+              <ProjectsMapSection
+                projectCentroidList={projectCentroids as Record<string, any>[]}
+              />
             ) : (
               <Skeleton className="axatw-animate-pulse naxatw-h-full naxatw-w-full" />
             )}

From c9003e462c77ec9bbecfc34a8bc671c987fa2dce Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Thu, 17 Oct 2024 17:56:02 +0545
Subject: [PATCH 14/22] fix: return, don't redirect to complete profile if
 userDetail is not success

---
 .../src/components/common/UserProfile/index.tsx        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/frontend/src/components/common/UserProfile/index.tsx b/src/frontend/src/components/common/UserProfile/index.tsx
index a8da0ce5..69b2d6a7 100644
--- a/src/frontend/src/components/common/UserProfile/index.tsx
+++ b/src/frontend/src/components/common/UserProfile/index.tsx
@@ -20,16 +20,10 @@ export default function UserProfile() {
   const role = localStorage.getItem('signedInAs');
 
   useEffect(() => {
-    if (userDetails?.role?.includes(role) || isFetching) return;
+    if (!userDetails || userDetails?.role?.includes(role) || isFetching) return;
     if (!userDetails?.has_user_profile || !userDetails?.role?.includes(role))
       navigate('/complete-profile');
-  }, [
-    userDetails?.has_user_profile,
-    userDetails?.role,
-    role,
-    navigate,
-    isFetching,
-  ]);
+  }, [userDetails, role, navigate, isFetching]);
 
   const settingOptions = [
     {

From df1a8138d3ec3eb931f889298af5cb56e0ddb79a Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Thu, 17 Oct 2024 19:20:23 +0545
Subject: [PATCH 15/22] feat: added user role in access token

---
 src/backend/app/users/auth.py         | 6 +++++-
 src/backend/app/users/user_routes.py  | 5 +++--
 src/backend/app/users/user_schemas.py | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/backend/app/users/auth.py b/src/backend/app/users/auth.py
index 69876a7b..a759f8ee 100644
--- a/src/backend/app/users/auth.py
+++ b/src/backend/app/users/auth.py
@@ -19,6 +19,7 @@ class Login(BaseModel):
 
 class Token(BaseModel):
     access_token: str
+    role: str
 
 
 class Auth:
@@ -83,15 +84,18 @@ def callback(self, callback_url: str) -> str:
 
         data = resp.json()
         serializer = URLSafeSerializer(self.secret_key)
+        
         user_data = {
             "id": data.get("id"),
             "email": data.get("email"),
             "name": data.get("name"),
             "profile_img": data.get("picture") if data.get("picture") else None,
+            "role": "USER",
+
         }
         token = serializer.dumps(user_data)
         access_token = base64.b64encode(bytes(token, "utf-8")).decode("utf-8")
-        token = Token(access_token=access_token)
+        token = Token(access_token=access_token, role='user')
         return json.loads(token.model_dump_json())
 
     def deserialize_access_token(self, access_token: str) -> dict:
diff --git a/src/backend/app/users/user_routes.py b/src/backend/app/users/user_routes.py
index 70749835..88342321 100644
--- a/src/backend/app/users/user_routes.py
+++ b/src/backend/app/users/user_routes.py
@@ -145,9 +145,10 @@ async def callback(request: Request, google_auth=Depends(init_google_auth)):
     access_token = google_auth.callback(callback_url).get("access_token")
 
     user_data = google_auth.deserialize_access_token(access_token)
+    
     access_token, refresh_token = await user_logic.create_access_token(user_data)
 
-    return Token(access_token=access_token, refresh_token=refresh_token)
+    return Token(access_token=access_token, refresh_token=refresh_token, role=user_data.get("role"))
 
 
 @router.get("/refresh-token", response_model=Token)
@@ -157,7 +158,7 @@ async def update_token(user_data: Annotated[AuthUser, Depends(login_required)]):
     access_token, refresh_token = await user_logic.create_access_token(
         user_data.model_dump()
     )
-    return Token(access_token=access_token, refresh_token=refresh_token)
+    return Token(access_token=access_token, refresh_token=refresh_token, role="user")
 
 
 @router.get("/my-info/")
diff --git a/src/backend/app/users/user_schemas.py b/src/backend/app/users/user_schemas.py
index 87d4880c..143516d3 100644
--- a/src/backend/app/users/user_schemas.py
+++ b/src/backend/app/users/user_schemas.py
@@ -45,6 +45,7 @@ class Token(BaseModel):
     access_token: str
     refresh_token: str
     token_type: str = "bearer"
+    role: str
 
 
 class UserPublic(UserBase):

From c151768df2b332308ecec6b4f9f44c92d5ba53f0 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Fri, 18 Oct 2024 07:08:45 +0545
Subject: [PATCH 16/22] feat: added role of user in auth

---
 sql                                        | 12 ++++++++++++
 src/backend/app/projects/project_routes.py |  3 ++-
 src/backend/app/users/auth.py              | 10 ++++------
 src/backend/app/users/user_deps.py         |  1 +
 src/backend/app/users/user_routes.py       | 19 ++++++++++++++-----
 src/backend/app/users/user_schemas.py      |  2 +-
 6 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 sql

diff --git a/sql b/sql
new file mode 100644
index 00000000..1b9ce9fa
--- /dev/null
+++ b/sql
@@ -0,0 +1,12 @@
+INSERT INTO task_events(event_id, project_id, task_id, user_id, state, comment, updated_at, created_at)
+VALUES (
+    gen_random_uuid(), 
+    'faa0b3e3-6971-4844-9767-5d70b1af78d8', 
+    'eb079b70-42c4-49ee-b956-e8d25efaae62', 
+    '117390901703903963194', 
+    'LOCKED_FOR_MAPPING', 
+    'task loked by dbadmin', 
+    now(), 
+    now()
+)
+RETURNING project_id, task_id, comment;
\ No newline at end of file
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index f4ca8e06..52018d8b 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -47,11 +47,12 @@
 )
 async def read_project_centroids(
     db: Annotated[Connection, Depends(database.get_db)],
-    # user_data: Annotated[AuthUser, Depends(login_required)],
+    user_data: Annotated[AuthUser, Depends(login_required)],
 ):
     """
     Get all project centroids.
     """
+    print("*" * 100, user_data)
     try:
         centroids = await project_logic.get_centroids(
             db,
diff --git a/src/backend/app/users/auth.py b/src/backend/app/users/auth.py
index a759f8ee..cd03b8b5 100644
--- a/src/backend/app/users/auth.py
+++ b/src/backend/app/users/auth.py
@@ -19,7 +19,6 @@ class Login(BaseModel):
 
 class Token(BaseModel):
     access_token: str
-    role: str
 
 
 class Auth:
@@ -58,7 +57,7 @@ def login(self) -> dict:
         login_url, _ = self.oauth.authorization_url(self.authorization_url)
         return json.loads(Login(login_url=login_url).model_dump_json())
 
-    def callback(self, callback_url: str) -> str:
+    def callback(self, callback_url: str, role: str) -> str:
         """Performs token exchange between Google and the callback website.
 
         Core will use Oauth secret key from configuration while deserializing token,
@@ -84,18 +83,17 @@ def callback(self, callback_url: str) -> str:
 
         data = resp.json()
         serializer = URLSafeSerializer(self.secret_key)
-        
+
         user_data = {
             "id": data.get("id"),
             "email": data.get("email"),
             "name": data.get("name"),
             "profile_img": data.get("picture") if data.get("picture") else None,
-            "role": "USER",
-
+            "role": role,
         }
         token = serializer.dumps(user_data)
         access_token = base64.b64encode(bytes(token, "utf-8")).decode("utf-8")
-        token = Token(access_token=access_token, role='user')
+        token = Token(access_token=access_token)
         return json.loads(token.model_dump_json())
 
     def deserialize_access_token(self, access_token: str) -> dict:
diff --git a/src/backend/app/users/user_deps.py b/src/backend/app/users/user_deps.py
index 29fd0c2c..393f35d0 100644
--- a/src/backend/app/users/user_deps.py
+++ b/src/backend/app/users/user_deps.py
@@ -37,6 +37,7 @@ async def login_required(
             email="admin@hotosm.org",
             name="admin",
             profile_img="",
+            role="",
         )
 
     if not access_token:
diff --git a/src/backend/app/users/user_routes.py b/src/backend/app/users/user_routes.py
index 88342321..9b0908b1 100644
--- a/src/backend/app/users/user_routes.py
+++ b/src/backend/app/users/user_routes.py
@@ -136,19 +136,26 @@ async def login_url(google_auth=Depends(init_google_auth)):
 
 
 @router.get("/callback/")
-async def callback(request: Request, google_auth=Depends(init_google_auth)):
+async def callback(
+    request: Request,
+    role: str = "PROJECT_CREATOR_1",
+    google_auth=Depends(init_google_auth),
+):
     """Performs token exchange between Google and DTM API"""
 
     # Enforce https callback url
     callback_url = str(request.url).replace("http://", "https://")
 
-    access_token = google_auth.callback(callback_url).get("access_token")
+    access_token = google_auth.callback(callback_url, role).get("access_token")
 
     user_data = google_auth.deserialize_access_token(access_token)
-    
+
     access_token, refresh_token = await user_logic.create_access_token(user_data)
 
-    return Token(access_token=access_token, refresh_token=refresh_token, role=user_data.get("role"))
+    return Token(
+        access_token=access_token,
+        refresh_token=refresh_token,
+    )
 
 
 @router.get("/refresh-token", response_model=Token)
@@ -158,7 +165,9 @@ async def update_token(user_data: Annotated[AuthUser, Depends(login_required)]):
     access_token, refresh_token = await user_logic.create_access_token(
         user_data.model_dump()
     )
-    return Token(access_token=access_token, refresh_token=refresh_token, role="user")
+    return Token(
+        access_token=access_token, refresh_token=refresh_token, role=user_data.role
+    )
 
 
 @router.get("/my-info/")
diff --git a/src/backend/app/users/user_schemas.py b/src/backend/app/users/user_schemas.py
index 143516d3..7f1e448b 100644
--- a/src/backend/app/users/user_schemas.py
+++ b/src/backend/app/users/user_schemas.py
@@ -20,6 +20,7 @@ class AuthUser(BaseModel):
     email: EmailStr
     name: str
     profile_img: Optional[str] = None
+    role: str = None
 
 
 class UserBase(BaseModel):
@@ -45,7 +46,6 @@ class Token(BaseModel):
     access_token: str
     refresh_token: str
     token_type: str = "bearer"
-    role: str
 
 
 class UserPublic(UserBase):

From fdbac3af0ad812c5510bbaf2c4e2aeb546bf925d Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Fri, 18 Oct 2024 13:07:29 +0545
Subject: [PATCH 17/22] fix: reslove project completed status after images
 processing

---
 docker-compose.yml                           | 25 ++++++++++++++-
 src/backend/app/config.py                    |  5 +--
 src/backend/app/projects/image_processing.py | 11 ++++---
 src/backend/app/projects/project_routes.py   | 33 +++++++++++++++++---
 src/backend/app/tasks/task_routes.py         | 27 +++++-----------
 src/backend/app/tasks/task_schemas.py        |  2 +-
 src/backend/app/users/user_routes.py         |  7 +++--
 src/backend/app/users/user_schemas.py        |  1 +
 8 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 51e83ced..0a4894e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,16 @@
 networks:
   dtm-network:
     name: dtm-network
-
+  
 volumes:
   db-data:
     name: drone-tm-db-data
   frontend-html:
     name: drone-tm-frontend-html
 
+  odm-media:
+  odm-db-data:
+
 services:
   backend:
     build:
@@ -81,6 +84,26 @@ services:
     networks:
       - dtm-network
     restart: unless-stopped
+  
+  odm-api:
+    image: docker.io/opendronemap/nodeodm:3.5.3
+    # This is hardcoded by default
+    hostname: webodm-node-odm-1
+    container_name: odm-api
+    networks:
+      - dtm-network
+    ports:
+      - 3001:3000
+    restart: unless-stopped
+    oom_score_adj: 500
+  
+  odm-broker:
+    image: docker.io/redis:7.0.10
+    container_name: odm-broker
+    networks:
+      - dtm-network
+    restart: unless-stopped
+    oom_score_adj: -500
 
   createbuckets:
     image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-08-03T04-33-23Z}"
diff --git a/src/backend/app/config.py b/src/backend/app/config.py
index 2b5ce89c..69461932 100644
--- a/src/backend/app/config.py
+++ b/src/backend/app/config.py
@@ -81,7 +81,7 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
         return pg_url
 
     FRONTEND_URL: str = "http://localhost:3040"
-    BACKEND_URL: str = "http://localhost:8000"
+    BACKEND_URL: str = "http://backend:8000"
 
     S3_ENDPOINT: str = "http://s3:9000"
     S3_ACCESS_KEY: Optional[str] = ""
@@ -106,8 +106,9 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
     SMTP_PASSWORD: Optional[str] = None
     EMAILS_FROM_EMAIL: Optional[EmailStr] = None
     EMAILS_FROM_NAME: Optional[str] = "Drone Tasking Manager"
-
     NODE_ODM_URL: Optional[str] = "http://odm-api:3000"
+    print("*"*100, NODE_ODM_URL)
+    # NODE_ODM_URL: Optional[str] = "https://odm.dronetm.org/?token=a24ba366-7c11-43e4-992a-3119d6dad089"
 
     @computed_field
     @property
diff --git a/src/backend/app/projects/image_processing.py b/src/backend/app/projects/image_processing.py
index c42bd881..9158baf0 100644
--- a/src/backend/app/projects/image_processing.py
+++ b/src/backend/app/projects/image_processing.py
@@ -5,6 +5,7 @@
 from app.tasks import task_logic
 from app.models.enums import State
 from app.utils import timestamp
+from app.db import database
 from pyodm import Node
 from app.s3 import get_file_from_bucket, list_objects_from_bucket, add_file_to_bucket
 from loguru import logger as log
@@ -191,7 +192,7 @@ def process_images_from_s3(self, bucket_name, name=None, options=[], webhook=Non
             pass
 
 
-def download_and_upload_assets_from_odm_to_s3(
+async def download_and_upload_assets_from_odm_to_s3(
     db: Connection,
     node_odm_url: str,
     task_id: str,
@@ -231,8 +232,8 @@ def download_and_upload_assets_from_odm_to_s3(
         log.info(f"Assets for task {task_id} successfully uploaded to S3.")
 
         # Update background task status to COMPLETED
-        update_task_status_sync = async_to_sync(task_logic.update_task_state)
-        update_task_status_sync(
+        # update_task_status_sync = async_to_sync(task_logic.update_task_state)
+        await task_logic.update_task_state(
             db,
             dtm_project_id,
             dtm_task_id,
@@ -240,8 +241,8 @@ def download_and_upload_assets_from_odm_to_s3(
             "Task completed.",
             State.IMAGE_UPLOADED,
             State.IMAGE_PROCESSED,
-            timestamp(),
-        )
+            timestamp())
+            
 
     except Exception as e:
         log.error(f"Error downloading or uploading assets for task {task_id}: {e}")
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 52018d8b..d45dda23 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -34,6 +34,7 @@
 from app.tasks import task_schemas
 from app.utils import geojson_to_kml, timestamp
 from app.users import user_schemas
+from asgiref.sync import async_to_sync
 
 
 router = APIRouter(
@@ -52,7 +53,6 @@ async def read_project_centroids(
     """
     Get all project centroids.
     """
-    print("*" * 100, user_data)
     try:
         centroids = await project_logic.get_centroids(
             db,
@@ -471,7 +471,6 @@ async def odm_webhook(
 
     task_id = payload.get("uuid")
     status = payload.get("status")
-
     if not task_id or not status:
         raise HTTPException(status_code=400, detail="Invalid webhook payload")
 
@@ -480,6 +479,8 @@ async def odm_webhook(
     # If status is 'success', download and upload assets to S3.
     # 40 is the status code for success in odm
     if status["code"] == 40:
+        log.info(f"Task ID: {task_id}, Status: going for download......")
+        
         # Call function to download assets from ODM and upload to S3
         background_tasks.add_task(
             image_processing.download_and_upload_assets_from_odm_to_s3,
@@ -491,6 +492,30 @@ async def odm_webhook(
             dtm_user_id,
         )
     elif status["code"] == 30:
-        # failed task
-        log.error(f'ODM task {task_id} failed: {status["errorMessage"]}')
+        background_tasks.add_task(
+            image_processing.download_and_upload_assets_from_odm_to_s3,
+            db,
+            settings.NODE_ODM_URL,
+            task_id,
+            dtm_project_id,
+            dtm_task_id,
+            dtm_user_id,
+        )
+        
+        # # failed task
+        # log.error(f'ODM task {task_id} failed: {status["errorMessage"]}')
+        # # Update background task status to COMPLETED
+        # # update_task_status_sync = async_to_sync(task_logic.update_task_state)
+        # await task_logic.update_task_state(
+        #     db,
+        #     dtm_project_id,
+        #     dtm_task_id,
+        #     dtm_user_id,
+        #     "Task completed.",
+        #     State.IMAGE_UPLOADED,
+        #     State.IMAGE_PROCESSED,
+        #     timestamp(),
+        # )
+    log.info(f"Task ID: {task_id}, Status: Webhook received")
+    
     return {"message": "Webhook received", "task_id": task_id}
diff --git a/src/backend/app/tasks/task_routes.py b/src/backend/app/tasks/task_routes.py
index 114f5789..69ee4e29 100644
--- a/src/backend/app/tasks/task_routes.py
+++ b/src/backend/app/tasks/task_routes.py
@@ -85,18 +85,14 @@ async def get_task_stats(
 
             if not records:
                 raise HTTPException(status_code=404, detail="User profile not found")
-            roles = [record["role"] for record in records]
-
-            if UserRole.PROJECT_CREATOR.name in roles:
-                role = "PROJECT_CREATOR"
-            else:
-                role = "DRONE_PILOT"
-
+            
+            role = user_data.role
+            
             # Query for task statistics
             raw_sql = """
                 SELECT
                     COUNT(CASE WHEN te.state = 'REQUEST_FOR_MAPPING' THEN 1 END) AS request_logs,
-                    COUNT(CASE WHEN te.state IN ('LOCKED_FOR_MAPPING', 'REQUEST_FOR_MAPPING', 'IMAGE_UPLOADED', 'UNFLYABLE_TASK') THEN 1 END) AS ongoing_tasks,
+                    COUNT(CASE WHEN te.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED') THEN 1 END) AS ongoing_tasks,
                     COUNT(CASE WHEN te.state = 'IMAGE_PROCESSED' THEN 1 END) AS completed_tasks,
                     COUNT(CASE WHEN te.state = 'UNFLYABLE_TASK' THEN 1 END) AS unflyable_tasks
                 FROM (
@@ -108,11 +104,8 @@ async def get_task_stats(
                     WHERE
                         (%(role)s = 'DRONE_PILOT' AND te.user_id = %(user_id)s)
                         OR
-                        (%(role)s != 'DRONE_PILOT' AND te.task_id IN (
-                            SELECT t.id
-                            FROM tasks t
-                            WHERE t.project_id IN (SELECT id FROM projects WHERE author_id = %(user_id)s)
-                        ))
+                        (%(role)s != 'DRONE_PILOT' AND te.user_id = %(user_id)s)
+                        
                     ORDER BY te.task_id, te.created_at DESC
                 ) AS te;
             """
@@ -149,13 +142,7 @@ async def list_tasks(
         if not records:
             raise HTTPException(status_code=404, detail="User profile not found")
 
-        roles = [record["role"] for record in records]
-
-        if UserRole.PROJECT_CREATOR.name in roles:
-            role = "PROJECT_CREATOR"
-        else:
-            role = "DRONE_PILOT"
-
+    role = user_data.role    
     return await task_schemas.UserTasksStatsOut.get_tasks_by_user(
         db, user_id, role, skip, limit
     )
diff --git a/src/backend/app/tasks/task_schemas.py b/src/backend/app/tasks/task_schemas.py
index 69ec9bc2..b1612347 100644
--- a/src/backend/app/tasks/task_schemas.py
+++ b/src/backend/app/tasks/task_schemas.py
@@ -186,7 +186,7 @@ async def get_tasks_by_user(
                     )
                     OR
                     (
-                        %(role)s!= 'DRONE_PILOT' AND task_events.project_id IN (SELECT id FROM projects WHERE author_id = %(user_id)s)
+                        %(role)s != 'DRONE_PILOT' AND task_events.user_id = %(user_id)s
                     )
                 ORDER BY
                     tasks.id, task_events.created_at DESC
diff --git a/src/backend/app/users/user_routes.py b/src/backend/app/users/user_routes.py
index 9b0908b1..481d4225 100644
--- a/src/backend/app/users/user_routes.py
+++ b/src/backend/app/users/user_routes.py
@@ -3,7 +3,7 @@
 from app.users import user_schemas
 from app.users import user_deps
 from app.users import user_logic
-from fastapi import APIRouter, HTTPException, Depends, Request, BackgroundTasks
+from fastapi import APIRouter, HTTPException, Depends, Request, BackgroundTasks, Form
 from typing import Annotated
 from fastapi.security import OAuth2PasswordRequestForm
 from app.users.user_schemas import (
@@ -38,6 +38,7 @@
 async def login_access_token(
     form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
     db: Annotated[Connection, Depends(database.get_db)],
+    role: str = Form(...),
 ) -> Token:
     """
     OAuth2 compatible token login, get an access token for future requests
@@ -54,6 +55,7 @@ async def login_access_token(
         "email": user.get("email_address"),
         "name": user.get("name"),
         "profile_img": user.get("profile_img"),
+        "role": role,
     }
 
     access_token, refresh_token = await user_logic.create_access_token(user_info)
@@ -138,7 +140,7 @@ async def login_url(google_auth=Depends(init_google_auth)):
 @router.get("/callback/")
 async def callback(
     request: Request,
-    role: str = "PROJECT_CREATOR_1",
+    role: str = "PROJECT_CREATOR",
     google_auth=Depends(init_google_auth),
 ):
     """Performs token exchange between Google and DTM API"""
@@ -155,6 +157,7 @@ async def callback(
     return Token(
         access_token=access_token,
         refresh_token=refresh_token,
+        role= role,
     )
 
 
diff --git a/src/backend/app/users/user_schemas.py b/src/backend/app/users/user_schemas.py
index 7f1e448b..e2ab854d 100644
--- a/src/backend/app/users/user_schemas.py
+++ b/src/backend/app/users/user_schemas.py
@@ -46,6 +46,7 @@ class Token(BaseModel):
     access_token: str
     refresh_token: str
     token_type: str = "bearer"
+    role: str
 
 
 class UserPublic(UserBase):

From cbae2f68592dfef61b5338027c91fdb388035b7f Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Fri, 18 Oct 2024 16:13:09 +0545
Subject: [PATCH 18/22] fix: update task counts & user task based on role

---
 docker-compose.yml                           | 25 +----------
 sql                                          | 12 ------
 src/backend/app/config.py                    |  5 +--
 src/backend/app/projects/image_processing.py |  5 +--
 src/backend/app/projects/project_routes.py   |  7 ++--
 src/backend/app/tasks/task_routes.py         | 44 ++++++--------------
 src/backend/app/tasks/task_schemas.py        | 43 +++++++++++++++----
 src/backend/app/users/user_routes.py         |  5 +--
 8 files changed, 58 insertions(+), 88 deletions(-)
 delete mode 100644 sql

diff --git a/docker-compose.yml b/docker-compose.yml
index 0a4894e3..51e83ced 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,13 @@
 networks:
   dtm-network:
     name: dtm-network
-  
+
 volumes:
   db-data:
     name: drone-tm-db-data
   frontend-html:
     name: drone-tm-frontend-html
 
-  odm-media:
-  odm-db-data:
-
 services:
   backend:
     build:
@@ -84,26 +81,6 @@ services:
     networks:
       - dtm-network
     restart: unless-stopped
-  
-  odm-api:
-    image: docker.io/opendronemap/nodeodm:3.5.3
-    # This is hardcoded by default
-    hostname: webodm-node-odm-1
-    container_name: odm-api
-    networks:
-      - dtm-network
-    ports:
-      - 3001:3000
-    restart: unless-stopped
-    oom_score_adj: 500
-  
-  odm-broker:
-    image: docker.io/redis:7.0.10
-    container_name: odm-broker
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: -500
 
   createbuckets:
     image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-08-03T04-33-23Z}"
diff --git a/sql b/sql
deleted file mode 100644
index 1b9ce9fa..00000000
--- a/sql
+++ /dev/null
@@ -1,12 +0,0 @@
-INSERT INTO task_events(event_id, project_id, task_id, user_id, state, comment, updated_at, created_at)
-VALUES (
-    gen_random_uuid(), 
-    'faa0b3e3-6971-4844-9767-5d70b1af78d8', 
-    'eb079b70-42c4-49ee-b956-e8d25efaae62', 
-    '117390901703903963194', 
-    'LOCKED_FOR_MAPPING', 
-    'task loked by dbadmin', 
-    now(), 
-    now()
-)
-RETURNING project_id, task_id, comment;
\ No newline at end of file
diff --git a/src/backend/app/config.py b/src/backend/app/config.py
index 69461932..2b5ce89c 100644
--- a/src/backend/app/config.py
+++ b/src/backend/app/config.py
@@ -81,7 +81,7 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
         return pg_url
 
     FRONTEND_URL: str = "http://localhost:3040"
-    BACKEND_URL: str = "http://backend:8000"
+    BACKEND_URL: str = "http://localhost:8000"
 
     S3_ENDPOINT: str = "http://s3:9000"
     S3_ACCESS_KEY: Optional[str] = ""
@@ -106,9 +106,8 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
     SMTP_PASSWORD: Optional[str] = None
     EMAILS_FROM_EMAIL: Optional[EmailStr] = None
     EMAILS_FROM_NAME: Optional[str] = "Drone Tasking Manager"
+
     NODE_ODM_URL: Optional[str] = "http://odm-api:3000"
-    print("*"*100, NODE_ODM_URL)
-    # NODE_ODM_URL: Optional[str] = "https://odm.dronetm.org/?token=a24ba366-7c11-43e4-992a-3119d6dad089"
 
     @computed_field
     @property
diff --git a/src/backend/app/projects/image_processing.py b/src/backend/app/projects/image_processing.py
index 9158baf0..de292109 100644
--- a/src/backend/app/projects/image_processing.py
+++ b/src/backend/app/projects/image_processing.py
@@ -5,7 +5,6 @@
 from app.tasks import task_logic
 from app.models.enums import State
 from app.utils import timestamp
-from app.db import database
 from pyodm import Node
 from app.s3 import get_file_from_bucket, list_objects_from_bucket, add_file_to_bucket
 from loguru import logger as log
@@ -241,8 +240,8 @@ async def download_and_upload_assets_from_odm_to_s3(
             "Task completed.",
             State.IMAGE_UPLOADED,
             State.IMAGE_PROCESSED,
-            timestamp())
-            
+            timestamp(),
+        )
 
     except Exception as e:
         log.error(f"Error downloading or uploading assets for task {task_id}: {e}")
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index d45dda23..d13d1dda 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -34,7 +34,6 @@
 from app.tasks import task_schemas
 from app.utils import geojson_to_kml, timestamp
 from app.users import user_schemas
-from asgiref.sync import async_to_sync
 
 
 router = APIRouter(
@@ -480,7 +479,7 @@ async def odm_webhook(
     # 40 is the status code for success in odm
     if status["code"] == 40:
         log.info(f"Task ID: {task_id}, Status: going for download......")
-        
+
         # Call function to download assets from ODM and upload to S3
         background_tasks.add_task(
             image_processing.download_and_upload_assets_from_odm_to_s3,
@@ -501,7 +500,7 @@ async def odm_webhook(
             dtm_task_id,
             dtm_user_id,
         )
-        
+
         # # failed task
         # log.error(f'ODM task {task_id} failed: {status["errorMessage"]}')
         # # Update background task status to COMPLETED
@@ -517,5 +516,5 @@ async def odm_webhook(
         #     timestamp(),
         # )
     log.info(f"Task ID: {task_id}, Status: Webhook received")
-    
+
     return {"message": "Webhook received", "task_id": task_id}
diff --git a/src/backend/app/tasks/task_routes.py b/src/backend/app/tasks/task_routes.py
index 69ee4e29..18715e23 100644
--- a/src/backend/app/tasks/task_routes.py
+++ b/src/backend/app/tasks/task_routes.py
@@ -3,7 +3,7 @@
 from app.projects import project_deps, project_schemas
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from app.config import settings
-from app.models.enums import EventType, HTTPStatus, State, UserRole
+from app.models.enums import EventType, HTTPStatus, State
 from app.tasks import task_schemas, task_logic
 from app.users.user_deps import login_required
 from app.users.user_schemas import AuthUser
@@ -76,19 +76,6 @@ async def get_task_stats(
 
     try:
         async with db.cursor(row_factory=dict_row) as cur:
-            # Check if the user profile exists
-            await cur.execute(
-                """SELECT role FROM user_profile WHERE user_id = %(user_id)s""",
-                {"user_id": user_id},
-            )
-            records = await cur.fetchall()
-
-            if not records:
-                raise HTTPException(status_code=404, detail="User profile not found")
-            
-            role = user_data.role
-            
-            # Query for task statistics
             raw_sql = """
                 SELECT
                     COUNT(CASE WHEN te.state = 'REQUEST_FOR_MAPPING' THEN 1 END) AS request_logs,
@@ -102,14 +89,21 @@ async def get_task_stats(
                         te.created_at
                     FROM task_events te
                     WHERE
-                        (%(role)s = 'DRONE_PILOT' AND te.user_id = %(user_id)s)
+                        (
+                        %(role)s = 'DRONE_PILOT'
+                        AND te.user_id = %(user_id)s
+                    )
                         OR
-                        (%(role)s != 'DRONE_PILOT' AND te.user_id = %(user_id)s)
-                        
+                        (%(role)s = 'PROJECT_CREATOR' AND te.project_id IN (
+                            SELECT p.id
+                            FROM projects p
+                            WHERE p.author_id = %(user_id)s -- Adjust this if your ownership is tracked differently
+                        ))
                     ORDER BY te.task_id, te.created_at DESC
                 ) AS te;
             """
-            await cur.execute(raw_sql, {"user_id": user_id, "role": role})
+
+            await cur.execute(raw_sql, {"user_id": user_id, "role": user_data.role})
             db_counts = await cur.fetchone()
 
         return db_counts
@@ -130,19 +124,7 @@ async def list_tasks(
 ):
     """Get all tasks for a all user."""
     user_id = user_data.id
-
-    async with db.cursor(row_factory=dict_row) as cur:
-        # Check if the user profile exists
-        await cur.execute(
-            """SELECT role FROM user_profile WHERE user_id = %(user_id)s""",
-            {"user_id": user_id},
-        )
-        records = await cur.fetchall()
-
-        if not records:
-            raise HTTPException(status_code=404, detail="User profile not found")
-
-    role = user_data.role    
+    role = user_data.role
     return await task_schemas.UserTasksStatsOut.get_tasks_by_user(
         db, user_id, role, skip, limit
     )
diff --git a/src/backend/app/tasks/task_schemas.py b/src/backend/app/tasks/task_schemas.py
index b1612347..a07ba043 100644
--- a/src/backend/app/tasks/task_schemas.py
+++ b/src/backend/app/tasks/task_schemas.py
@@ -159,7 +159,8 @@ async def get_tasks_by_user(
     ):
         async with db.cursor(row_factory=class_row(UserTasksStatsOut)) as cur:
             await cur.execute(
-                """SELECT DISTINCT ON (tasks.id)
+                """
+                SELECT DISTINCT ON (tasks.id)
                     tasks.id AS task_id,
                     tasks.project_task_index AS project_task_index,
                     task_events.project_id AS project_id,
@@ -168,10 +169,21 @@ async def get_tasks_by_user(
                     task_events.created_at,
                     task_events.updated_at,
                     CASE
-                        WHEN task_events.state = 'REQUEST_FOR_MAPPING' THEN 'request logs'
-                        WHEN task_events.state = 'LOCKED_FOR_MAPPING' OR task_events.state = 'IMAGE_UPLOADED' THEN 'ongoing'
-                        WHEN task_events.state = 'IMAGE_PROCESSED' THEN 'completed'
-                        WHEN task_events.state = 'UNFLYABLE_TASK' THEN 'unflyable task'
+                        WHEN %(role)s = 'DRONE_PILOT' AND task_events.state != 'REQUEST_FOR_MAPPING' THEN
+                            CASE
+                                WHEN task_events.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED') THEN 'ongoing'
+                                WHEN task_events.state = 'IMAGE_PROCESSED' THEN 'completed'
+                                WHEN task_events.state = 'UNFLYABLE_TASK' THEN 'unflyable task'
+                                ELSE ''
+                            END
+                        WHEN %(role)s = 'PROJECT_CREATOR' THEN
+                            CASE
+                                WHEN task_events.state = 'REQUEST_FOR_MAPPING' THEN 'request logs'
+                                WHEN task_events.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED') THEN 'ongoing'
+                                WHEN task_events.state = 'IMAGE_PROCESSED' THEN 'completed'
+                                WHEN task_events.state = 'UNFLYABLE_TASK' THEN 'unflyable task'
+                                ELSE ''
+                            END
                         ELSE ''
                     END AS state
                 FROM
@@ -182,16 +194,31 @@ async def get_tasks_by_user(
                     projects ON task_events.project_id = projects.id
                 WHERE
                     (
-                        %(role)s = 'DRONE_PILOT' AND task_events.user_id = %(user_id)s
+                        %(role)s = 'DRONE_PILOT'
+                        AND task_events.user_id = %(user_id)s
                     )
                     OR
                     (
-                        %(role)s != 'DRONE_PILOT' AND task_events.user_id = %(user_id)s
+                        %(role)s = 'PROJECT_CREATOR'
+                        AND task_events.project_id IN (
+                            SELECT p.id
+                            FROM projects p
+                            WHERE p.id IN (
+                                SELECT t.project_id
+                                FROM tasks t
+                                WHERE t.project_id IN (
+                                    SELECT DISTINCT te2.project_id
+                                    FROM task_events te2
+                                    WHERE te2.user_id = %(user_id)s
+                                )
+                            )
+                        )
                     )
                 ORDER BY
                     tasks.id, task_events.created_at DESC
                 OFFSET %(skip)s
-                LIMIT %(limit)s;""",
+                LIMIT %(limit)s;
+                """,
                 {"user_id": user_id, "role": role, "skip": skip, "limit": limit},
             )
             try:
diff --git a/src/backend/app/users/user_routes.py b/src/backend/app/users/user_routes.py
index 481d4225..c1ed6e9d 100644
--- a/src/backend/app/users/user_routes.py
+++ b/src/backend/app/users/user_routes.py
@@ -140,14 +140,13 @@ async def login_url(google_auth=Depends(init_google_auth)):
 @router.get("/callback/")
 async def callback(
     request: Request,
-    role: str = "PROJECT_CREATOR",
+    role: str,
     google_auth=Depends(init_google_auth),
 ):
     """Performs token exchange between Google and DTM API"""
 
     # Enforce https callback url
     callback_url = str(request.url).replace("http://", "https://")
-
     access_token = google_auth.callback(callback_url, role).get("access_token")
 
     user_data = google_auth.deserialize_access_token(access_token)
@@ -157,7 +156,7 @@ async def callback(
     return Token(
         access_token=access_token,
         refresh_token=refresh_token,
-        role= role,
+        role=role,
     )
 
 

From 5a706b843e18cf7a9e67f301062267da73af1017 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Fri, 18 Oct 2024 16:34:47 +0545
Subject: [PATCH 19/22] feat: added restriction on task lock request, only
 project author & drone operator can request the task

---
 src/backend/app/tasks/task_routes.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/backend/app/tasks/task_routes.py b/src/backend/app/tasks/task_routes.py
index 18715e23..4b73c078 100644
--- a/src/backend/app/tasks/task_routes.py
+++ b/src/backend/app/tasks/task_routes.py
@@ -3,7 +3,7 @@
 from app.projects import project_deps, project_schemas
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from app.config import settings
-from app.models.enums import EventType, HTTPStatus, State
+from app.models.enums import EventType, HTTPStatus, State, UserRole
 from app.tasks import task_schemas, task_logic
 from app.users.user_deps import login_required
 from app.users.user_schemas import AuthUser
@@ -152,10 +152,19 @@ async def new_event(
 ):
     user_id = user_data.id
     project = project.model_dump()
+    user_role = user_data.role
+
     match detail.event:
         case EventType.REQUESTS:
             # Determine the appropriate state and message
             is_author = project["author_id"] == user_id
+
+            if user_role != UserRole.DRONE_PILOT and not is_author:
+                raise HTTPException(
+                    status_code=403,
+                    detail="Only the project author or drone operators can request tasks for this project.",
+                )
+
             requires_approval = project["requires_approval_from_manager_for_locking"]
 
             if is_author or not requires_approval:

From 7be6fdee23e513ba887148e9b337e66d31532526 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Fri, 18 Oct 2024 17:20:14 +0545
Subject: [PATCH 20/22] refac: remove print & commented code from get projects

---
 src/backend/app/projects/project_routes.py | 14 --------------
 src/backend/app/tasks/task_routes.py       |  3 +--
 src/backend/app/tasks/task_schemas.py      | 19 ++++---------------
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index d13d1dda..0fee6d3c 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -501,20 +501,6 @@ async def odm_webhook(
             dtm_user_id,
         )
 
-        # # failed task
-        # log.error(f'ODM task {task_id} failed: {status["errorMessage"]}')
-        # # Update background task status to COMPLETED
-        # # update_task_status_sync = async_to_sync(task_logic.update_task_state)
-        # await task_logic.update_task_state(
-        #     db,
-        #     dtm_project_id,
-        #     dtm_task_id,
-        #     dtm_user_id,
-        #     "Task completed.",
-        #     State.IMAGE_UPLOADED,
-        #     State.IMAGE_PROCESSED,
-        #     timestamp(),
-        # )
     log.info(f"Task ID: {task_id}, Status: Webhook received")
 
     return {"message": "Webhook received", "task_id": task_id}
diff --git a/src/backend/app/tasks/task_routes.py b/src/backend/app/tasks/task_routes.py
index 4b73c078..64146bd7 100644
--- a/src/backend/app/tasks/task_routes.py
+++ b/src/backend/app/tasks/task_routes.py
@@ -73,7 +73,6 @@ async def get_task_stats(
 ):
     "Retrieve statistics related to tasks for the authenticated user."
     user_id = user_data.id
-
     try:
         async with db.cursor(row_factory=dict_row) as cur:
             raw_sql = """
@@ -97,7 +96,7 @@ async def get_task_stats(
                         (%(role)s = 'PROJECT_CREATOR' AND te.project_id IN (
                             SELECT p.id
                             FROM projects p
-                            WHERE p.author_id = %(user_id)s -- Adjust this if your ownership is tracked differently
+                            WHERE p.author_id = %(user_id)s
                         ))
                     ORDER BY te.task_id, te.created_at DESC
                 ) AS te;
diff --git a/src/backend/app/tasks/task_schemas.py b/src/backend/app/tasks/task_schemas.py
index a07ba043..f5c6999f 100644
--- a/src/backend/app/tasks/task_schemas.py
+++ b/src/backend/app/tasks/task_schemas.py
@@ -169,21 +169,10 @@ async def get_tasks_by_user(
                     task_events.created_at,
                     task_events.updated_at,
                     CASE
-                        WHEN %(role)s = 'DRONE_PILOT' AND task_events.state != 'REQUEST_FOR_MAPPING' THEN
-                            CASE
-                                WHEN task_events.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED') THEN 'ongoing'
-                                WHEN task_events.state = 'IMAGE_PROCESSED' THEN 'completed'
-                                WHEN task_events.state = 'UNFLYABLE_TASK' THEN 'unflyable task'
-                                ELSE ''
-                            END
-                        WHEN %(role)s = 'PROJECT_CREATOR' THEN
-                            CASE
-                                WHEN task_events.state = 'REQUEST_FOR_MAPPING' THEN 'request logs'
-                                WHEN task_events.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED') THEN 'ongoing'
-                                WHEN task_events.state = 'IMAGE_PROCESSED' THEN 'completed'
-                                WHEN task_events.state = 'UNFLYABLE_TASK' THEN 'unflyable task'
-                                ELSE ''
-                            END
+                        WHEN task_events.state = 'REQUEST_FOR_MAPPING' THEN 'request logs'
+                        WHEN task_events.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED') THEN 'ongoing'
+                        WHEN task_events.state = 'IMAGE_PROCESSED' THEN 'completed'
+                        WHEN task_events.state = 'UNFLYABLE_TASK' THEN 'unflyable task'
                         ELSE ''
                     END AS state
                 FROM

From 8d03c348dbcffaa6b2d0f0ac22ea49f8a984a648 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Fri, 18 Oct 2024 17:35:04 +0545
Subject: [PATCH 21/22] feat: add user role on login payload

---
 src/frontend/src/components/GoogleAuth/index.tsx               | 3 ++-
 .../src/components/Authentication/Login/index.tsx              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/components/GoogleAuth/index.tsx b/src/frontend/src/components/GoogleAuth/index.tsx
index f6f4bee4..f217a52f 100644
--- a/src/frontend/src/components/GoogleAuth/index.tsx
+++ b/src/frontend/src/components/GoogleAuth/index.tsx
@@ -13,6 +13,7 @@ function GoogleAuth() {
   const [isReadyToRedirect, setIsReadyToRedirect] = useState(false);
   const [userProfileDetails, setUserProfileDetails] =
     useState<UserProfileDetailsType>();
+  const signedInAs = localStorage.getItem('signedInAs') || 'PROJECT_CREATOR';
 
   useEffect(() => {
     const params = new URLSearchParams(location.search);
@@ -21,7 +22,7 @@ function GoogleAuth() {
 
     const loginRedirect = async () => {
       if (authcode) {
-        const callbackUrl = `${BASE_URL}/users/callback/?code=${authcode}&state=${state}`;
+        const callbackUrl = `${BASE_URL}/users/callback/?code=${authcode}&state=${state}&role=${signedInAs}`;
         const userDetailsUrl = `${BASE_URL}/users/my-info/`;
 
         const completeLogin = async () => {
diff --git a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
index 4497d45b..e61c051b 100644
--- a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
+++ b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx
@@ -74,7 +74,7 @@ export default function Login() {
   });
 
   const onSubmit = (data: { username: string; password: string }) =>
-    mutate(data);
+    mutate({ ...data, role: signedInAs });
 
   return (
     <>

From 2286ed8f19a47ecbea151e41509607db919cd039 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Fri, 18 Oct 2024 17:43:00 +0545
Subject: [PATCH 22/22] fix: added role on pydentic class to validate

---
 src/backend/app/users/user_routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/app/users/user_routes.py b/src/backend/app/users/user_routes.py
index c1ed6e9d..baa7dcc7 100644
--- a/src/backend/app/users/user_routes.py
+++ b/src/backend/app/users/user_routes.py
@@ -60,7 +60,7 @@ async def login_access_token(
 
     access_token, refresh_token = await user_logic.create_access_token(user_info)
 
-    return Token(access_token=access_token, refresh_token=refresh_token)
+    return Token(access_token=access_token, refresh_token=refresh_token, role=role)
 
 
 @router.get("/", tags=["users"], response_model=list[user_schemas.DbUser])