v5.3.1 to staging

.github/workflows/issue_label.yml

@@ -0,0 +1,23 @@
+# We add a label `repo:repo-name` to each new issue,
+# for easier tracking in external systems
+
+name: 🏷️ Issue Label
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  issue-label:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: repo:tm

README.md

@@ -40,7 +40,7 @@ Status | Feature | Release
 ✅ | 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
+✅ | Super Mapper: Redefine Mapper Level Milestones | [v5.2.0](https://github.com/hotosm/tasking-manager/releases/tag/v5.2.0)
 🔄 | OSM Practice Projects: Enable users to engage in OSM practice projects within Tasking Manager workflow.
 📅 | Expanding Project Types beyond basemap features
 📅 | AI Integration: task assignment, difficulty estimation, and validation

backend/api/partners/statistics.py

@@ -109,11 +109,15 @@ async def get_filtered_statistics(
             sub_code=MAPSWIPE_GROUP_EMPTY_SUBCODE,
             message=MAPSWIPE_GROUP_EMPTY_MESSAGE,
         )
-
     mapswipe = MapswipeService()
-    return mapswipe.fetch_filtered_partner_stats(
-        partner.id, partner.mapswipe_group_id, from_date, to_date
-    )
+    try:
+        result = await mapswipe.fetch_filtered_partner_stats(
+            partner.id, partner.mapswipe_group_id, from_date, to_date
+        )
+    finally:
+        await mapswipe.aclose()
+
+    return result
 
 
 @router.get("/{permalink:str}/general-statistics/")
@@ -176,13 +180,16 @@ async def get_general_statistics(
         )
 
     mapswipe = MapswipeService()
-    group_dto = mapswipe.fetch_grouped_partner_stats(
-        partner.id,
-        partner.mapswipe_group_id,
-        limit,
-        offset,
-        download_as_csv,
-    )
+    try:
+        group_dto = await mapswipe.fetch_grouped_partner_stats(
+            partner.id,
+            partner.mapswipe_group_id,
+            limit,
+            offset,
+            download_as_csv,
+        )
+    finally:
+        await mapswipe.aclose()
 
     if download_as_csv:
         csv_content = group_dto.to_csv()

backend/api/teams/actions.py

@@ -1,3 +1,5 @@
+from typing import List
+from backend.models.dtos.team_dto import ProjectTeamPairDTOList
 from databases import Database
 from fastapi import APIRouter, BackgroundTasks, Body, Depends, Request
 from fastapi.responses import JSONResponse
@@ -407,3 +409,213 @@ async def message_team(
         )
     except ValueError as e:
         return JSONResponse(content={"Error": str(e)}, status_code=400)
+
+
+@router.delete("/projects/{project_id}/teams/{team_id}/")
+async def remove_team_from_project(
+    project_id: int,
+    team_id: int,
+    request: Request,
+    user: AuthUserDTO = Depends(login_required),
+    db: Database = Depends(get_db),
+):
+    """
+    Unlink a Team from a Project.
+    """
+    permitted = await TeamService.is_user_team_manager(team_id, user.id, db)
+    if not permitted:
+        return JSONResponse(
+            {
+                "Error": "User is not a manager of the team",
+                "SubCode": "UserPermissionError",
+            },
+            status_code=403,
+        )
+
+    deny_resp = await TeamService.ensure_unlink_allowed(project_id, team_id, db)
+    if deny_resp:
+        return deny_resp
+
+    try:
+        deleted = await TeamService.unlink_team(project_id, team_id, db)
+        if not deleted:
+            return JSONResponse(
+                {"Error": "No such team linked to project", "SubCode": "NotFoundError"},
+                status_code=404,
+            )
+        return JSONResponse({"Success": True}, status_code=200)
+    except Exception as e:
+        return JSONResponse(
+            {"Error": "Internal server error", "Details": str(e)},
+            status_code=500,
+        )
+
+
+@router.delete("/projects/teams/{team_id}/unlink")
+async def remove_team_from_all_projects(
+    team_id: int,
+    request: Request,
+    user: AuthUserDTO = Depends(login_required),
+    db: Database = Depends(get_db),
+):
+    """
+    Unlink the given team from all projects it is assigned to.
+
+    Steps:
+    - ensure caller is a manager of the team
+    - fetch all project_ids for the team from project_teams
+    - run ensure_unlink_allowed(project_id, team_id, db) for every project
+    - if all checks pass, unlink each (inside one DB transaction)
+    """
+    permitted = await TeamService.is_user_team_manager(team_id, user.id, db)
+    if not permitted:
+        return JSONResponse(
+            {
+                "Error": (
+                    f"Cannot unlink team with team id-{team_id}: "
+                    f"user {user.id} is not a manager of the team"
+                ),
+                "SubCode": "UserPermissionError",
+            },
+            status_code=403,
+        )
+
+    rows = await db.fetch_all(
+        "SELECT project_id FROM project_teams WHERE team_id = :tid",
+        {"tid": team_id},
+    )
+    project_ids: List[int] = [r["project_id"] for r in rows] if rows else []
+
+    if not project_ids:
+        return JSONResponse(
+            {
+                "Error": (
+                    f"Cannot unlink team with team id-{team_id}: "
+                    "team is not linked to any projects"
+                ),
+                "SubCode": "NotFoundError",
+            },
+            status_code=404,
+        )
+
+    for pid in project_ids:
+        deny_resp = await TeamService.ensure_unlink_allowed(pid, team_id, db)
+        if deny_resp:
+            return deny_resp
+
+    try:
+        async with db.transaction():
+            for pid in project_ids:
+                deleted = await TeamService.unlink_team(pid, team_id, db)
+                if not deleted:
+                    raise RuntimeError(f"NOT_FOUND:{pid}:{team_id}")
+
+        projects_str = ", ".join(str(p) for p in project_ids)
+        return JSONResponse(
+            {
+                "Success": True,
+                "Message": (
+                    f"Team id-{team_id} unlinked from projects: {projects_str}"
+                ),
+            },
+            status_code=200,
+        )
+
+    except Exception as e:
+        return JSONResponse(
+            {
+                "Error": (
+                    f"Cannot unlink team with team id-{team_id}: internal server error - {str(e)}"
+                ),
+                "SubCode": "InternalServerError",
+            },
+            status_code=500,
+        )
+
+
+@router.delete("/projects/unlink")
+async def remove_teams_from_projects(
+    payload: ProjectTeamPairDTOList,
+    request: Request,
+    user: AuthUserDTO = Depends(login_required),
+    db: Database = Depends(get_db),
+):
+    """
+    Bulk unlink teams from projects.
+
+    Body:
+    {
+      "items": [
+        {"project_id": 1442, "team_id": 43},
+        {"project_id": 2000, "team_id": 55}
+      ]
+    }
+
+    First: run all checks for all items (manager check + ensure_unlink_allowed).
+    If any check fails, return error immediately and do NOT modify DB.
+    If all checks pass, perform unlink operations inside a single DB transaction.
+    """
+    items = payload.items or []
+    if not items:
+        return JSONResponse(
+            {"Error": "No project/team pairs provided", "SubCode": "InvalidRequest"},
+            status_code=400,
+        )
+
+    seen = set()
+    pairs = []
+    for it in items:
+        key = (it.project_id, it.team_id)
+        if key in seen:
+            continue
+        seen.add(key)
+        pairs.append(it)
+
+    for it in pairs:
+        pid = it.project_id
+        tid = it.team_id
+
+        permitted = await TeamService.is_user_team_manager(tid, user.id, db)
+        if not permitted:
+            return JSONResponse(
+                {
+                    "Error": (
+                        f"Cannot unlink team with team id-{tid}: user {user.id} is not a manager of the team"
+                    ),
+                    "SubCode": "UserPermissionError",
+                },
+                status_code=403,
+            )
+
+        deny_resp = await TeamService.ensure_unlink_allowed(pid, tid, db)
+        if deny_resp:
+            return deny_resp
+
+    try:
+        async with db.transaction():
+            for it in pairs:
+                pid = it.project_id
+                tid = it.team_id
+
+                deleted = await TeamService.unlink_team(pid, tid, db)
+                if not deleted:
+                    raise RuntimeError(f"NOT_FOUND:{pid}:{tid}")
+
+        pairs_str = ", ".join(
+            [f"(project {p.project_id}, team {p.team_id})" for p in pairs]
+        )
+        return JSONResponse(
+            {
+                "Success": True,
+                "Message": f"Unlinked teams: {pairs_str}",
+            },
+            status_code=200,
+        )
+    except Exception as e:
+        return JSONResponse(
+            {
+                "Error": f"Cannot unlink teams: internal server error - {str(e)}",
+                "SubCode": "InternalServerError",
+            },
+            status_code=500,
+        )

backend/config.py

@@ -57,7 +57,7 @@ class Config:
 
     # The address to use as the receiver in contact form.
     EMAIL_CONTACT_ADDRESS: str = os.getenv(
-        "TM_EMAIL_CONTACT_ADDRESS", "sysadmin@hotosm.org"
+        "TM_EMAIL_CONTACT_ADDRESS", "admin@yourorganisation.com"
     )
 
     # A freely definable secret key for connecting the front end with the back end
@@ -269,6 +269,11 @@ def assemble_db_connection(
     # Sentry backend DSN
     SENTRY_BACKEND_DSN: Optional[str] = os.getenv("TM_SENTRY_BACKEND_DSN", None)
 
+    # Mapswipe backend url
+    MAPSWIPE_API_URL: str = os.getenv(
+        "MAPSWIPE_API_URL", "https://backend.mapswipe.org/graphql/"
+    )
+
     # Ohsome Stats Token
     OHSOME_STATS_TOKEN: str = os.getenv("OHSOME_STATS_TOKEN", None)
     OHSOME_STATS_API_URL: str = os.getenv(

backend/models/dtos/team_dto.py

@@ -247,3 +247,12 @@ class TeamSearchDTO(BaseModel):
 
     class Config:
         populate_by_name = True
+
+
+class ProjectTeamPairDTO(BaseModel):
+    project_id: int
+    team_id: int
+
+
+class ProjectTeamPairDTOList(BaseModel):
+    items: List[ProjectTeamPairDTO]

backend/models/dtos/user_dto.py

@@ -30,6 +30,7 @@ class UserDTO(BaseModel):
     username: Optional[str] = None
     role: Optional[str] = None
     mapping_level: Optional[str] = Field(None, alias="mappingLevel")
+    level_ordering: Optional[int] = None
     projects_mapped: Optional[int] = Field(None, alias="projectsMapped")
     email_address: Optional[str] = Field(None, alias="emailAddress")
     is_email_verified: Optional[bool] = Field(

backend/models/postgis/project.py

@@ -286,7 +286,7 @@ async def set_project_aoi(self, draft_project_dto: DraftProjectDTO, db: Database
         valid_geojson = geojson.dumps(aoi_geometry)
 
         query = """
-        SELECT ST_AsText(
+        SELECT ST_AsEWKT(
             ST_SetSRID(
                 ST_GeomFromGeoJSON(:geojson), 4326
             )
@@ -295,9 +295,8 @@ async def set_project_aoi(self, draft_project_dto: DraftProjectDTO, db: Database
         # Execute the query with the GeoJSON value passed in as a parameter
         result = await db.fetch_one(query=query, values={"geojson": valid_geojson})
         self.geometry = result["geometry_wkt"] if result else None
-
         query = """
-        SELECT ST_AsText(ST_Centroid(ST_SetSRID(ST_GeomFromGeoJSON(:geometry), 4326))) AS centroid
+        SELECT ST_AsEWKT(ST_Centroid(ST_SetSRID(ST_GeomFromGeoJSON(:geometry), 4326))) AS centroid
         """
 
         # Execute the query and pass the GeoJSON as a parameter

backend/models/postgis/task.py

@@ -749,7 +749,9 @@ def from_geojson_feature(cls, task_id, task_feature):
             task.y = task_feature.properties["y"]
             task.zoom = task_feature.properties["zoom"]
             task.is_square = task_feature.properties["isSquare"]
-            task.geometry = shape(task_feature.geometry).wkt
+            wkt = shape(task_feature.geometry).wkt
+            ewkt = f"SRID=4326;{wkt}"
+            task.geometry = ewkt
         except KeyError as e:
             raise InvalidData(
                 f"PropertyNotFound: Expected property not found: {str(e)}"

backend/models/postgis/user.py

@@ -476,9 +476,13 @@ async def as_dto(self, logged_in_username: str, db: Database) -> UserDTO:
         user_dto.id = self.id
         user_dto.username = self.username
         user_dto.role = UserRole(self.role).name
+
         user_dto.mapping_level = (
             await MappingLevel.get_by_id(self.mapping_level, db)
         ).name
+        user_dto.level_ordering = (
+            await MappingLevel.get_by_id(self.mapping_level, db)
+        ).ordering
         user_dto.projects_mapped = (
             len(self.projects_mapped) if self.projects_mapped else None
         )