Merge pull request #6650 from hotosm/fastapi-refactor

Remove db connection dependency in routers

backend/api/annotations/resources.py

@@ -14,7 +14,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/campaigns/resources.py

@@ -15,7 +15,6 @@
 router = APIRouter(
     prefix="/campaigns",
     tags=["campaigns"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/comments/resources.py

@@ -1,12 +1,13 @@
-from backend.models.postgis.utils import timestamp
 from databases import Database
-from fastapi import APIRouter, Depends, Request, BackgroundTasks
-from loguru import logger
+from fastapi import APIRouter, BackgroundTasks, Depends, Request
 from fastapi.responses import JSONResponse
+from loguru import logger
+
 from backend.db import get_db, get_session
 from backend.models.dtos.mapping_dto import TaskCommentDTO
 from backend.models.dtos.message_dto import ChatMessageDTO
 from backend.models.dtos.user_dto import AuthUserDTO
+from backend.models.postgis.utils import timestamp
 from backend.services.mapping_service import MappingService, MappingServiceError
 from backend.services.messaging.chat_service import ChatService
 from backend.services.project_service import ProjectService
@@ -19,7 +20,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/countries/resources.py

@@ -8,7 +8,6 @@
 router = APIRouter(
     prefix="/countries",
     tags=["countries"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/interests/resources.py

@@ -13,7 +13,6 @@
 router = APIRouter(
     prefix="/interests",
     tags=["interests"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/issues/resources.py

@@ -12,7 +12,6 @@
 router = APIRouter(
     prefix="/tasks",
     tags=["issues"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/licenses/actions.py

@@ -10,7 +10,6 @@
 router = APIRouter(
     prefix="/licenses",
     tags=["licenses"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/licenses/resources.py

@@ -9,7 +9,6 @@
 router = APIRouter(
     prefix="/licenses",
     tags=["licenses"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/notifications/actions.py

@@ -10,7 +10,6 @@
 router = APIRouter(
     prefix="/notifications",
     tags=["notifications"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/notifications/resources.py

@@ -16,7 +16,6 @@
 router = APIRouter(
     prefix="/notifications",
     tags=["notifications"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/organisations/campaigns.py

@@ -12,7 +12,6 @@
 router = APIRouter(
     prefix="/organisations",
     tags=["organisations"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/organisations/resources.py

@@ -23,7 +23,6 @@
 router = APIRouter(
     prefix="/organisations",
     tags=["organisations"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/partners/resources.py

@@ -14,7 +14,6 @@
 router = APIRouter(
     prefix="/partners",
     tags=["partners"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/partners/statistics.py

@@ -21,7 +21,6 @@ def is_valid_group_id(group_id: Optional[str]) -> bool:
 router = APIRouter(
     prefix="/partners",
     tags=["partners"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/actions.py

@@ -1,11 +1,11 @@
 from databases import Database
-from fastapi import APIRouter, Body, Depends, Request, BackgroundTasks
+from fastapi import APIRouter, BackgroundTasks, Body, Depends, Request
 from fastapi.responses import JSONResponse
 from loguru import logger
 from shapely import GEOSException
 from shapely.errors import TopologicalError
 
-from backend.db import get_db, db_connection
+from backend.db import db_connection, get_db
 from backend.models.dtos.grid_dto import GridDTO
 from backend.models.dtos.message_dto import MessageDTO
 from backend.models.dtos.user_dto import AuthUserDTO
@@ -23,7 +23,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/activities.py

@@ -8,7 +8,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/campaigns.py

@@ -17,7 +17,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/contributions.py

@@ -11,7 +11,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/favorites.py

@@ -10,7 +10,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/partnerships.py

@@ -16,7 +16,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/resources.py

@@ -44,7 +44,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/statistics.py

@@ -9,7 +9,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/projects/teams.py

@@ -13,7 +13,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/system/applications.py

@@ -10,7 +10,6 @@
 router = APIRouter(
     prefix="/system",
     tags=["system"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/system/authentication.py

@@ -17,7 +17,6 @@
 router = APIRouter(
     prefix="/system",
     tags=["system"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/system/banner.py

@@ -14,7 +14,6 @@
 router = APIRouter(
     prefix="/system",
     tags=["system"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/system/general.py

@@ -12,7 +12,6 @@
 router = APIRouter(
     prefix="/system",
     tags=["system"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/system/image_upload.py

@@ -5,14 +5,12 @@
 from fastapi.responses import JSONResponse
 
 from backend.config import settings
-from backend.db import get_db
 from backend.models.dtos.user_dto import AuthUserDTO
 from backend.services.users.authentication_service import login_required
 
 router = APIRouter(
     prefix="/system",
     tags=["system"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/system/statistics.py

@@ -8,7 +8,6 @@
 router = APIRouter(
     prefix="/system",
     tags=["system"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/tasks/actions.py

@@ -35,7 +35,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["tasks"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/tasks/resources.py

@@ -21,7 +21,6 @@
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/teams/actions.py

@@ -17,7 +17,6 @@
 router = APIRouter(
     prefix="/teams",
     tags=["teams"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/teams/resources.py

@@ -17,7 +17,6 @@
 router = APIRouter(
     prefix="/teams",
     tags=["teams"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/users/statistics.py

@@ -17,7 +17,6 @@
 router = APIRouter(
     prefix="/users",
     tags=["users"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/users/tasks.py

@@ -12,7 +12,6 @@
 router = APIRouter(
     prefix="/users",
     tags=["users"],
-    dependencies=[Depends(get_db)],
     responses={404: {"description": "Not found"}},
 )
 

backend/services/stats_service.py

@@ -95,20 +95,10 @@ async def _update_tasks_stats(
 
         # Increment counters for the new state
         if new_state == TaskStatus.MAPPED:
-            print(type(project_stats["tasks_mapped"]))
-            print(project_stats["tasks_mapped"], "Task mapped before...")
-
             project_stats["tasks_mapped"] += 1
 
-            print(project_stats["tasks_mapped"], "Task mapped after...")
-
         elif new_state == TaskStatus.VALIDATED:
-            print(project_stats["tasks_validated"], "Task validated before...")
-
             project_stats["tasks_validated"] += 1
-
-            print(project_stats["tasks_validated"], "Task validated after...")
-
         elif new_state == TaskStatus.BADIMAGERY:
             project_stats["tasks_bad_imagery"] += 1
 
@@ -123,38 +113,13 @@ async def _update_tasks_stats(
 
         # Decrement counters for the old state
         if last_state == TaskStatus.MAPPED:
-            print(
-                project_stats["tasks_mapped"], "Last state mapped decrement before..."
-            )
-
             project_stats["tasks_mapped"] -= 1
-
-            print(project_stats["tasks_mapped"], "Last state mapped decrement after...")
-
         elif last_state == TaskStatus.VALIDATED:
-            print(
-                project_stats["tasks_mapped"],
-                "Last state validation decrement before...",
-            )
-
             project_stats["tasks_validated"] -= 1
 
-            print(
-                project_stats["tasks_mapped"],
-                "Last state validation decrement after...",
-            )
-
         elif last_state == TaskStatus.BADIMAGERY:
-            print(
-                project_stats["tasks_mapped"], "Last state bad_img decrement before..."
-            )
-
             project_stats["tasks_bad_imagery"] -= 1
 
-            print(
-                project_stats["tasks_mapped"], "Last state bad_img decrement after..."
-            )
-
         # Undo user stats if action is "undo"
         if action == "undo":
             if last_state == TaskStatus.MAPPED: