v5.0.5 patch

.github/workflows/backend-build-deploy.yml

@@ -61,6 +61,7 @@ jobs:
           context: "{{defaultContext}}"
           target: prod
           platforms: linux/amd64,linux/arm64
+          file: scripts/docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/backend-build.yml

@@ -13,3 +13,4 @@ jobs:
     with:
       image_name: ghcr.io/${{ github.repository }}/backend
       build_target: prod
+      dockerfile: scripts/docker/Dockerfile

.github/workflows/frontend-build.yml

@@ -73,3 +73,13 @@ jobs:
           name: tm-fe-${{ github.sha }}
           path: ./frontend/build
           retention-days: 2
+
+  frontend-dev-image-build:
+    name: Build dev image for testing
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1
+    with:
+      image_name: ghcr.io/${{ github.repository }}/frontend
+      build_target: debug
+      dockerfile: scripts/docker/Dockerfile.frontend
+      scan_image: false
+      scan_dockerfile: false

.gitignore

@@ -1,5 +1,6 @@
 # Configuration files #
 tasking-manager*.env
+.env
 
 # Generated frontend #
 frontend/node_modules/

README.md

@@ -34,13 +34,12 @@ Status | Feature | Release
 -------|---------|---------
 ✅ | Up-to-date OSM Statistics: Integrated with [ohsome Now](https://stats.now.ohsome.org/) for real-time data insights.| Released in [v4.6.2](https://github.com/hotosm/tasking-manager/releases/tag/v4.6.2).
 ✅ | Downloadable OSM Exports: Export data directly from each project. | Available in[ v4.7.0](https://github.com/hotosm/tasking-manager/releases/tag/v4.7.0).
-✅ | Live Data Quality Monitoring: Monitor project data quality in real-time. | Introduced in [v4.7.2](https://github.com/hotosm/tasking-manager/releases/tag/v4.7.2).
-✅ | Rapid Editor Upgrade: Enhanced mapping experience with the latest rapid editor updates.
-✅ | Public-Facing Partner Pages: Create and display dedicated pages for partners running remote mapathons.
-✅ | Downloadable Project List View: Allow users to explore projects via a downloadable list. [View issue](https://github.com/hotosm/tasking-manager/issues/3394).
-✅ | MapSwipe Stats Integration: Display MapSwipe statistics on Partner Pages.
-✅ | iD Editor Latest Features: Integrate the newest features of the iD editor.
-🔄 | FastAPI Migration: Improve performance and scalability of Tasking Manager to handle large scale validation and mapping efforts.
+✅ | Rapid Editor Upgrade: Enhanced mapping experience with the latest rapid editor updates.| Last updated in [v4.8.2](https://github.com/hotosm/tasking-manager/releases/tag/v4.8.2)
+✅ | Public-Facing Partner Pages: Create and display dedicated pages for partners running remote mapathons.| [v4.8.2](https://github.com/hotosm/tasking-manager/releases/tag/v4.8.2)
+✅ | Downloadable Project List View: Allow users to explore projects via a downloadable list. [View issue](https://github.com/hotosm/tasking-manager/issues/3394).| [v4.8.2](https://github.com/hotosm/tasking-manager/releases/tag/v4.8.2)
+✅ | MapSwipe Stats Integration: Display MapSwipe statistics on Partner Pages.|[v4.8.2](https://github.com/hotosm/tasking-manager/releases/tag/v4.8.2)
+✅ | iD Editor Latest Features: Integrate the newest features of the iD editor.|[v5.0.5](https://github.com/hotosm/tasking-manager/releases/tag/v5.0.5)
+✅ | FastAPI Migration: Improve performance and scalability of Tasking Manager to handle large scale validation and mapping efforts.| [v5 launch 🎉](https://github.com/hotosm/tasking-manager/releases/tag/v5.0.0)
 🔄 | Super Mapper: Redefine Mapper Level Milestones
 🔄 | OSM Practice Projects: Enable users to engage in OSM practice projects within Tasking Manager workflow.
 📅 | Expanding Project Types beyond basemap features

backend/api/comments/resources.py

@@ -1,5 +1,5 @@
 from databases import Database
-from fastapi import APIRouter, BackgroundTasks, Depends, Request
+from fastapi import APIRouter, BackgroundTasks, Depends, Request, Query
 from fastapi.responses import JSONResponse
 from loguru import logger
 
@@ -95,8 +95,13 @@ async def post_comment(
 
 
 @router.get("/{project_id}/comments/")
-async def ge_comments(
-    request: Request, project_id: int, db: Database = Depends(get_db)
+async def get_comments(
+    project_id: int,
+    page: int = Query(1, description="Page of results user requested"),
+    per_page: int = Query(
+        20, alias="perPage", description="Number of elements per page"
+    ),
+    db: Database = Depends(get_db),
 ):
     """
     Get all chat messages for a project
@@ -131,10 +136,6 @@ async def ge_comments(
             description: Internal Server Error
     """
     await ProjectService.exists(project_id, db)
-    page = (
-        int(request.query_params.get("page")) if request.query_params.get("page") else 1
-    )
-    per_page = int(request.query_params.get("perPage", 20))
     project_messages = await ChatService.get_messages(project_id, db, page, per_page)
     return project_messages
 

backend/api/issues/resources.py

@@ -1,5 +1,5 @@
 from databases import Database
-from fastapi import APIRouter, Body, Depends, Request
+from fastapi import APIRouter, Body, Depends, Request, Query
 from fastapi.responses import JSONResponse
 from loguru import logger
 
@@ -164,7 +164,14 @@ async def delete_issue(
 
 
 @router.get("/issues/categories/")
-async def get_issues_categories(request: Request, db: Database = Depends(get_db)):
+async def get_issues_categories(
+    include_archived: bool = Query(
+        False,
+        alias="includeArchived",
+        description="Optional filter to include archived categories",
+    ),
+    db: Database = Depends(get_db),
+):
     """
     Gets all mapping issue categories
     ---
@@ -184,7 +191,6 @@ async def get_issues_categories(request: Request, db: Database = Depends(get_db)
         500:
             description: Internal Server Error
     """
-    include_archived = request.query_params.get("includeArchived") == "true"
     categories = await MappingIssueCategoryService.get_all_mapping_issue_categories(
         include_archived, db
     )

backend/api/notifications/actions.py

@@ -1,5 +1,5 @@
 from databases import Database
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends, Request, Query
 from fastapi.responses import JSONResponse
 
 from backend.db import get_db
@@ -60,7 +60,11 @@ async def delete_multiple_notifications(
 
 @router.delete("/delete-all/")
 async def delete_all_notifications(
-    request: Request,
+    message_type: str = Query(
+        None,
+        alias="messageType",
+        description="Optional message-type filter; leave blank to delete all",
+    ),
     db: Database = Depends(get_db),
     user: AuthUserDTO = Depends(login_required),
 ):
@@ -88,15 +92,18 @@ async def delete_all_notifications(
         500:
             description: Internal Server Error
     """
-    message_type = request.query_params.get("messageType")
     async with db.transaction():
         await MessageService.delete_all_messages(user.id, db, message_type)
         return JSONResponse(content={"Success": "Messages deleted"}, status_code=200)
 
 
 @router.post("/mark-as-read-all/")
 async def mark_all_as_read(
-    request: Request,
+    message_type: str = Query(
+        None,
+        alias="messageType",
+        description="Optional message-type filter; leave blank to mark all as read",
+    ),
     user: AuthUserDTO = Depends(login_required),
     db: Database = Depends(get_db),
 ):
@@ -124,7 +131,6 @@ async def mark_all_as_read(
         500:
             description: Internal Server Error
     """
-    message_type = request.query_params.get("messageType")
     await MessageService.mark_all_messages_read(user.id, db, message_type)
     return JSONResponse(content={"Success": "Messages marked as read"}, status_code=200)
 

backend/api/notifications/resources.py

@@ -1,5 +1,5 @@
 from databases import Database
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends, Request, Query
 from fastapi.responses import JSONResponse
 
 from backend.db import get_db
@@ -117,6 +117,53 @@ async def get_notifications(
     request: Request,
     db: Database = Depends(get_db),
     user: AuthUserDTO = Depends(login_required),
+    message_type: str | None = Query(
+        default=None,
+        description=(
+            "Optional message-type filter; leave blank to retrieve all.\n"
+            "Accepted values: 1 (System), 2 (Broadcast), 3 (Mention), 4 (Validation),\n"
+            "5 (Invalidation), 6 (Request team), 7 (Invitation), 8 (Task comment),\n"
+            "9 (Project chat), 10 (Project Activity), 11 (Team broadcast)"
+        ),
+        alias="messageType",
+    ),
+    from_username: str | None = Query(
+        default=None,
+        alias="from",
+        description="Optional from username filter",
+    ),
+    project: str | None = Query(
+        default=None,
+        description="Optional project filter",
+    ),
+    task_id: int | None = Query(
+        default=None,
+        description="Optional task filter",
+        alias="taskId",
+    ),
+    status: str | None = Query(
+        default=None,
+        description="Optional status filter (read or unread)",
+    ),
+    sort_by: str = Query(
+        default="date",
+        description="Field to sort by. Options: 'date', 'read', 'project_id', 'message_type'",
+        alias="sortBy",
+    ),
+    sort_direction: str = Query(
+        default="desc",
+        description="Sorting direction: 'asc' or 'desc'",
+        alias="sortDirection",
+    ),
+    page: int = Query(
+        default=1,
+        description="Page number",
+    ),
+    page_size: int = Query(
+        default=10,
+        alias="pageSize",
+        description="Number of results per page",
+    ),
 ):
     """
     Get all messages for logged in user
@@ -182,15 +229,7 @@ async def get_notifications(
             description: Internal Server Error
     """
     preferred_locale = request.headers.get("accept-language")
-    page = request.query_params.get("page", 1)
-    page_size = request.query_params.get("pageSize", 10)
-    sort_by = request.query_params.get("sortBy", "date")
-    sort_direction = request.query_params.get("sortDirection", "desc")
-    message_type = request.query_params.get("messageType", None)
-    from_username = request.query_params.get("from")
-    project = request.query_params.get("project", None)
-    task_id = request.query_params.get("taskId", None)
-    status = request.query_params.get("status", None)
+
     user_messages = await MessageService.get_all_messages(
         db,
         user.id,

backend/api/partners/statistics.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 from databases import Database
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends, Query
 from fastapi.responses import StreamingResponse
 
 from backend.db import get_db
@@ -27,8 +27,19 @@ def is_valid_group_id(group_id: Optional[str]) -> bool:
 
 @router.get("/{permalink:str}/filtered-statistics/")
 async def get_filtered_statistics(
-    request: Request,
     permalink: str,
+    from_date: str | None = Query(
+        default=None,
+        alias="fromDate",
+        description="Fetch partner statistics from date as yyyy-mm-dd",
+        example="2024-01-01",
+    ),
+    to_date: str | None = Query(
+        default=None,
+        alias="toDate",
+        description="Fetch partner statistics to date as yyyy-mm-dd",
+        example="2024-09-01",
+    ),
     db: Database = Depends(get_db),
 ):
     """
@@ -66,9 +77,6 @@ async def get_filtered_statistics(
         500:
             description: Internal Server Error
     """
-    mapswipe = MapswipeService()
-    from_date = request.query_params.get("fromDate")
-    to_date = request.query_params.get("toDate")
 
     if from_date is None:
         raise BadRequest(
@@ -102,15 +110,22 @@ async def get_filtered_statistics(
             message=MAPSWIPE_GROUP_EMPTY_MESSAGE,
         )
 
+    mapswipe = MapswipeService()
     return mapswipe.fetch_filtered_partner_stats(
         partner.id, partner.mapswipe_group_id, from_date, to_date
     )
 
 
 @router.get("/{permalink:str}/general-statistics/")
 async def get_general_statistics(
-    request: Request,
     permalink: str,
+    limit: int = Query(10, description="The number of partner members to fetch"),
+    offset: int = Query(
+        0, description="The starting index from which to fetch partner members"
+    ),
+    download_as_csv: bool = Query(
+        False, alias="downloadAsCSV", description="Download users in this group as CSV"
+    ),
     db: Database = Depends(get_db),
 ):
     """
@@ -152,8 +167,6 @@ async def get_general_statistics(
         500:
             description: Internal Server Error
     """
-
-    mapswipe = MapswipeService()
     partner = await PartnerService.get_partner_by_permalink(permalink, db)
 
     if not is_valid_group_id(partner.mapswipe_group_id):
@@ -162,10 +175,7 @@ async def get_general_statistics(
             message=MAPSWIPE_GROUP_EMPTY_MESSAGE,
         )
 
-    limit = int(request.query_params.get("limit", 10))
-    offset = int(request.query_params.get("offset", 0))
-    download_as_csv = bool(request.query_params.get("downloadAsCSV", "false") == "true")
-
+    mapswipe = MapswipeService()
     group_dto = mapswipe.fetch_grouped_partner_stats(
         partner.id,
         partner.mapswipe_group_id,
@@ -176,9 +186,8 @@ async def get_general_statistics(
 
     if download_as_csv:
         csv_content = group_dto.to_csv()
-        csv_buffer = io.StringIO(csv_content)
         return StreamingResponse(
-            content=csv_buffer,
+            content=io.StringIO(csv_content),
             media_type="text/csv",
             headers={"Content-Disposition": "attachment; filename=partner_members.csv"},
         )

backend/api/projects/activities.py

@@ -1,5 +1,5 @@
 from databases import Database
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends, Request, Query
 
 from backend.db import get_db
 from backend.services.project_service import ProjectService
@@ -14,7 +14,9 @@
 
 @router.get("/{project_id}/activities/")
 async def get_activities(
-    request: Request, project_id: int, db: Database = Depends(get_db)
+    project_id: int,
+    page: int = Query(1, description="Page of results user requested", ge=1),
+    db: Database = Depends(get_db),
 ):
     """
     Get all user activity on a project
@@ -43,9 +45,6 @@ async def get_activities(
             description: Internal Server Error
     """
     await ProjectService.exists(project_id, db)
-    page = (
-        int(request.query_params.get("page")) if request.query_params.get("page") else 1
-    )
     activity = await StatsService.get_latest_activity(project_id, page, db)
     return activity