Merge pull request #203 from hotosm/develop

Production Release

src/backend/app/config.py

@@ -80,6 +80,7 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
         )
         return pg_url
 
+    FRONTEND_URL: str = "http://localhost:3040"
     S3_ENDPOINT: str = "http://s3:9000"
     S3_ACCESS_KEY: Optional[str] = ""
     S3_SECRET_KEY: Optional[str] = ""

src/backend/app/drones/drone_logic.py

@@ -2,8 +2,6 @@
 from loguru import logger as log
 from fastapi import HTTPException
 from psycopg import Connection
-
-# from asyncpg import UniqueViolationError
 from typing import List
 from app.drones.drone_schemas import DroneOut
 

src/backend/app/drones/drone_routes.py

@@ -27,7 +27,7 @@ async def read_drones(
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND) from e
 
 
-@router.post("/create_drone")
+@router.post("/create-drone")
 async def create_drone(
     drone_info: drone_schemas.DroneIn,
     db: Annotated[Connection, Depends(database.get_db)],

src/backend/app/email_templates/mapping_approved_or_rejected.html → src/backend/app/email_templates/mapping/approved_or_rejected.html

@@ -125,7 +125,9 @@ <h2>{{ task_status|capitalize }} Task Details</h2>
             <p><strong>Description:</strong> {{ description }}</p>
           </div>
           {% if task_status == 'approved' %}
-          <a href="https://dronetm-dev.naxa.com.np" class="task-button"
+          <a
+            href="{{FRONTEND_URL}}/projects/{{project_id}}/tasks/{{task_id}}"
+            class="task-button"
             >Start Mapping</a
           >
           {% endif %}

src/backend/app/email_templates/mapping_requests.html → src/backend/app/email_templates/mapping/requests.html

@@ -130,7 +130,9 @@ <h2>Mapping Task Details</h2>
             <p><strong>Project:</strong>{{project_name}}</p>
             <p><strong>Description:</strong> {{description}}</p>
           </div>
-          <a href="dronetm.naxa.com.np" class="task-button"
+          <a
+            href="{{FRONTEND_URL}}/projects/{{project_id}}/tasks/{{task_id}}"
+            class="task-button"
             >Visit Drone Tasking Manager</a
           >
         </div>

src/backend/app/projects/project_logic.py

@@ -14,7 +14,7 @@
 
 
 async def upload_file_to_s3(
-    project_id: uuid.UUID, file: UploadFile, folder: str, file_extension: str
+    project_id: uuid.UUID, file: UploadFile, file_name: str
 ) -> str:
     """
     Upload a file (image or DEM) to S3.
@@ -28,14 +28,8 @@ async def upload_file_to_s3(
     Returns:
         str: The S3 URL for the uploaded file.
     """
-    # If the folder is 'images', use 'screenshot.png' as the filename
-    if folder == "images":
-        file_name = "screenshot.png"
-    else:
-        file_name = f"dem.{file_extension}"
-
     # Define the S3 file path
-    file_path = f"/{folder}/{project_id}/{file_name}"
+    file_path = f"/projects/{project_id}/{file_name}"
 
     # Read the file bytes
     file_bytes = await file.read()
@@ -55,7 +49,7 @@ async def upload_file_to_s3(
     return file_url
 
 
-async def update_url(db: Connection, project_id: uuid.UUID, url: str, url_type: str):
+async def update_url(db: Connection, project_id: uuid.UUID, url: str):
     """
     Update the URL (DEM or image) for a project in the database.
 
@@ -70,9 +64,9 @@ async def update_url(db: Connection, project_id: uuid.UUID, url: str, url_type:
     """
     async with db.cursor() as cur:
         await cur.execute(
-            f"""
+            """
             UPDATE projects
-            SET {url_type} = %(url)s
+            SET dem_url = %(url)s
             WHERE id = %(project_id)s""",
             {"url": url, "project_id": project_id},
         )

src/backend/app/projects/project_routes.py

@@ -1,8 +1,19 @@
 import os
-from typing import Annotated
+from typing import Annotated, Optional
+from uuid import UUID
 import geojson
 from datetime import timedelta
-from fastapi import APIRouter, HTTPException, Depends, UploadFile, File, Form
+from fastapi import (
+    APIRouter,
+    HTTPException,
+    Depends,
+    Path,
+    Query,
+    UploadFile,
+    File,
+    Form,
+    Response,
+)
 from geojson_pydantic import FeatureCollection
 from loguru import logger as log
 from psycopg import Connection
@@ -16,13 +27,74 @@
 from app.config import settings
 from app.users.user_deps import login_required
 from app.users.user_schemas import AuthUser
+from app.tasks import task_schemas
 
 router = APIRouter(
     prefix=f"{settings.API_PREFIX}/projects",
     responses={404: {"description": "Not found"}},
 )
 
 
+@router.get("/{project_id}/download-boundaries", tags=["Projects"])
+async def download_boundaries(
+    project_id: Annotated[
+        UUID,
+        Path(
+            description="The project ID in UUID format.",
+        ),
+    ],
+    db: Annotated[Connection, Depends(database.get_db)],
+    user_data: Annotated[AuthUser, Depends(login_required)],
+    task_id: Optional[UUID] = Query(
+        default=None,
+        description="The task ID in UUID format. If not provided, all tasks will be downloaded.",
+    ),
+    split_area: bool = Query(
+        default=False,
+        description="Whether to split the area or not. Set to True to download task boundaries, otherwise AOI will be downloaded.",
+    ),
+):
+    """Downloads the AOI or task boundaries for a project as a GeoJSON file.
+
+    Args:
+        project_id (UUID): The ID of the project in UUID format.
+        db (Connection): The database connection, provided automatically.
+        user_data (AuthUser): The authenticated user data, checks if the user has permission.
+        task_id (Optional[UUID]): The task ID in UUID format. If not provided and split_area is True, all tasks will be downloaded.
+        split_area (bool): Whether to split the area or not. Set to True to download task boundaries, otherwise AOI will be downloaded.
+
+    Returns:
+        Response: The HTTP response object containing the downloaded file.
+    """
+    try:
+        out = await task_schemas.Task.get_task_geometry(
+            db, project_id, task_id, split_area
+        )
+
+        if out is None:
+            raise HTTPException(status_code=404, detail="Geometry not found.")
+
+        filename = (
+            (f"task_{task_id}.geojson" if task_id else "project_outline.geojson")
+            if split_area
+            else "project_aoi.geojson"
+        )
+
+        headers = {
+            "Content-Disposition": f"attachment; filename={filename}",
+            "Content-Type": "application/geo+json",
+        }
+        return Response(content=out, headers=headers)
+
+    except HTTPException as e:
+        log.error(f"Error during boundaries download: {e.detail}")
+        raise e
+
+    except Exception as e:
+        log.error(f"Unexpected error during boundaries download: {e}")
+        raise HTTPException(status_code=500, detail="Internal server error.")
+
+
 @router.delete("/{project_id}", tags=["Projects"])
 async def delete_project_by_id(
     project: Annotated[
@@ -61,16 +133,16 @@ async def create_project(
 
     # Upload DEM and Image to S3
     dem_url = (
-        await project_logic.upload_file_to_s3(project_id, dem, "dem", "tif")
+        await project_logic.upload_file_to_s3(project_id, dem, "dem.tif")
         if dem
         else None
     )
     await project_logic.upload_file_to_s3(
-        project_id, image, "images", "png"
+        project_id, image, "map_screenshot.png"
     ) if image else None
 
     # Update DEM and Image URLs in the database
-    await project_logic.update_url(db, project_id, dem_url, "dem_url")
+    await project_logic.update_url(db, project_id, dem_url)
 
     if not project_id:
         raise HTTPException(
@@ -168,7 +240,7 @@ async def generate_presigned_url(
         client = s3_client()
         urls = []
         for image in data.image_name:
-            image_path = f"publicuploads/{data.project_id}/{data.task_id}/{image}"
+            image_path = f"projects/{data.project_id}/{data.task_id}/images/{image}"
 
             url = client.get_presigned_url(
                 "PUT",

src/backend/app/projects/project_schemas.py

@@ -419,7 +419,7 @@ def set_image_url(cls, values):
         """Set image_url before rendering the model."""
         project_id = values.id
         if project_id:
-            image_dir = f"images/{project_id}/screenshot.png"
+            image_dir = f"projects/{project_id}/map_screenshot.png"
             values.image_url = get_image_dir_url(settings.S3_BUCKET_NAME, image_dir)
         return values
 

src/backend/app/tasks/task_logic.py

@@ -33,7 +33,6 @@ async def get_task_geojson(db: Connection, task_id: uuid.UUID):
                 status_code=HTTPStatus.NOT_FOUND, detail="Task not found"
             )
         return data[0]
-        # return json.loads(data[0]["geom"])
 
 
 async def update_task_state(
@@ -123,8 +122,8 @@ async def request_mapping(
                 "task_id": str(task_id),
                 "user_id": str(user_id),
                 "comment": comment,
-                "unlocked_to_map_state": initial_state.name,  # State.UNLOCKED_TO_MAP.name,
-                "request_for_map_state": final_state.name,  # State.REQUEST_FOR_MAPPING.name,
+                "unlocked_to_map_state": initial_state.name,
+                "request_for_map_state": final_state.name,
             },
         )
         result = await cur.fetchone()

src/backend/app/tasks/task_routes.py

@@ -158,7 +158,7 @@ async def task_states(
     db: Annotated[Connection, Depends(database.get_db)], project_id: uuid.UUID
 ):
     """Get all tasks states for a project."""
-    return await task_schemas.TaskState.all(db, project_id)
+    return await task_schemas.Task.all(db, project_id)
 
 
 @router.post("/event/{project_id}/{task_id}")
@@ -177,38 +177,44 @@ async def new_event(
     project = project.model_dump()
     match detail.event:
         case EventType.REQUESTS:
-            if project["requires_approval_from_manager_for_locking"] is False:
-                data = await task_logic.request_mapping(
-                    db,
-                    project_id,
-                    task_id,
-                    user_id,
-                    "Request accepted automatically",
-                    State.UNLOCKED_TO_MAP,
-                    State.LOCKED_FOR_MAPPING,
+            # Determine the appropriate state and message
+            is_author = project["author_id"] == user_id
+            requires_approval = project["requires_approval_from_manager_for_locking"]
+
+            if is_author or not requires_approval:
+                state_after = State.LOCKED_FOR_MAPPING
+                message = "Request accepted automatically" + (
+                    " as the author" if is_author else ""
                 )
             else:
-                data = await task_logic.request_mapping(
-                    db,
-                    project_id,
-                    task_id,
-                    user_id,
-                    "Request for mapping",
-                    State.UNLOCKED_TO_MAP,
-                    State.REQUEST_FOR_MAPPING,
-                )
-                # email notification
+                state_after = State.REQUEST_FOR_MAPPING
+                message = "Request for mapping"
+
+            # Perform the mapping request
+            data = await task_logic.request_mapping(
+                db,
+                project_id,
+                task_id,
+                user_id,
+                message,
+                State.UNLOCKED_TO_MAP,
+                state_after,
+            )
+            # Send email notification if approval is required
+            if state_after == State.REQUEST_FOR_MAPPING:
                 author = await user_schemas.DbUser.get_user_by_id(
                     db, project["author_id"]
                 )
                 html_content = render_email_template(
-                    template_name="mapping_requests.html",
+                    template_name="requests.html",
                     context={
                         "name": author["name"],
                         "drone_operator_name": user_data.name,
                         "task_id": task_id,
+                        "project_id": project_id,
                         "project_name": project["name"],
                         "description": project["description"],
+                        "FRONTEND_URL": settings.FRONTEND_URL,
                     },
                 )
                 background_tasks.add_task(
@@ -217,6 +223,7 @@ async def new_event(
                     "Request for mapping",
                     html_content,
                 )
+
             return data
 
         case EventType.MAP:
@@ -233,16 +240,18 @@ async def new_event(
                 db, requested_user_id
             )
             html_content = render_email_template(
-                template_name="mapping_approved_or_rejected.html",
+                template_name="approved_or_rejected.html",
                 context={
                     "email_subject": "Mapping Request Approved",
                     "email_body": "We are pleased to inform you that your mapping request has been approved. Your contribution is invaluable to our efforts in improving humanitarian responses worldwide.",
                     "task_status": "approved",
                     "name": user_data.name,
                     "drone_operator_name": drone_operator["name"],
                     "task_id": task_id,
+                    "project_id": project_id,
                     "project_name": project["name"],
                     "description": project["description"],
+                    "FRONTEND_URL": settings.FRONTEND_URL,
                 },
             )
 
@@ -277,14 +286,15 @@ async def new_event(
                 db, requested_user_id
             )
             html_content = render_email_template(
-                template_name="mapping_approved_or_rejected.html",
+                template_name="approved_or_rejected.html",
                 context={
                     "email_subject": "Mapping Request Rejected",
                     "email_body": "We are sorry to inform you that your mapping request has been rejected.",
                     "task_status": "rejected",
                     "name": user_data.name,
                     "drone_operator_name": drone_operator["name"],
                     "task_id": task_id,
+                    "project_id": project_id,
                     "project_name": project["name"],
                     "description": project["description"],
                 },