fix: Recommended projects, my tasks in my contrib section and cleanups

backend/api/comments/resources.py

@@ -3,7 +3,7 @@
 from fastapi.responses import JSONResponse
 from loguru import logger
 
-from backend.db import get_db, get_session
+from backend.db import get_db
 from backend.models.dtos.mapping_dto import TaskCommentDTO
 from backend.models.dtos.message_dto import ChatMessageDTO
 from backend.models.dtos.user_dto import AuthUserDTO
@@ -14,9 +14,6 @@
 from backend.services.users.authentication_service import login_required
 from backend.services.users.user_service import UserService
 
-session = get_session()
-
-
 router = APIRouter(
     prefix="/projects",
     tags=["projects"],

backend/api/tasks/statistics.py

@@ -1,21 +1,28 @@
 from datetime import date, timedelta
-from backend.services.stats_service import StatsService
-from backend.api.utils import validate_date_input
+
+from databases import Database
 from fastapi import APIRouter, Depends, Request
-from backend.db import get_session
-from starlette.authentication import requires
+
+from backend.api.utils import validate_date_input
+from backend.db import get_db
+from backend.models.dtos.user_dto import AuthUserDTO
+from backend.services.stats_service import StatsService
+from backend.services.users.authentication_service import login_required
 
 router = APIRouter(
     prefix="/tasks",
     tags=["tasks"],
-    dependencies=[Depends(get_session)],
     responses={404: {"description": "Not found"}},
 )
 
 
 @router.get("/statistics/")
-@requires("authenticated")
-async def get(request: Request):
+async def get(
+    request: Request,
+    organisation_id: int,
+    db: Database = Depends(get_db),
+    user: AuthUserDTO = Depends(login_required),
+):
     """
     Get Task Stats
     ---

backend/api/users/actions.py

@@ -1,21 +1,18 @@
-from fastapi import APIRouter, Depends, Request, Body
+from databases import Database
+from fastapi import APIRouter, Body, Depends, Request
 from fastapi.responses import JSONResponse
 from loguru import logger
 
-from backend.models.dtos.user_dto import UserDTO, UserRegisterEmailDTO
-from databases import Database
 from backend.db import get_db
-from backend.services.users.authentication_service import login_required
-from backend.models.dtos.user_dto import AuthUserDTO
+from backend.models.dtos.user_dto import AuthUserDTO, UserDTO, UserRegisterEmailDTO
+from backend.services.interests_service import InterestService
 from backend.services.messaging.message_service import MessageService
+from backend.services.users.authentication_service import login_required
 from backend.services.users.user_service import UserService, UserServiceError
-from backend.services.interests_service import InterestService
-from backend.db import get_session
 
 router = APIRouter(
     prefix="/users",
     tags=["users"],
-    dependencies=[Depends(get_session)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/users/openstreetmap.py

@@ -1,23 +1,26 @@
-from backend.services.users.user_service import UserService, OSMServiceError
+from databases import Database
 from fastapi import APIRouter, Depends, Request
-from backend.db import get_session
-from starlette.authentication import requires
+from fastapi.responses import JSONResponse
+
 from backend.db import get_db
-from databases import Database
+from backend.models.dtos.user_dto import AuthUserDTO
+from backend.services.users.authentication_service import login_required
+from backend.services.users.user_service import OSMServiceError, UserService
 
 router = APIRouter(
     prefix="/users",
     tags=["users"],
-    dependencies=[Depends(get_session)],
     responses={404: {"description": "Not found"}},
 )
 
 
-# class UsersOpenStreetMapAPI(Resource):
-# @token_auth.login_required
 @router.get("/{username}/openstreetmap/")
-@requires("authenticated")
-async def get(request: Request, db: Database = Depends(get_db), username: str = None):
+async def get(
+    request: Request,
+    db: Database = Depends(get_db),
+    user: AuthUserDTO = Depends(login_required),
+    username: str = None,
+):
     """
     Get details from OpenStreetMap for a specified username
     ---
@@ -54,4 +57,4 @@ async def get(request: Request, db: Database = Depends(get_db), username: str =
         osm_dto = await UserService.get_osm_details_for_user(username, db)
         return osm_dto.model_dump(by_alias=True)
     except OSMServiceError as e:
-        return {"Error": str(e)}, 502
+        return JSONResponse(content={"Error": str(e)}, status_code=502)

backend/api/users/resources.py

@@ -6,7 +6,7 @@
 from loguru import logger
 
 
-from backend.db import get_db, get_session
+from backend.db import get_db
 from backend.models.dtos.user_dto import AuthUserDTO, UserSearchQuery
 from backend.services.project_service import ProjectService
 from backend.services.users.authentication_service import login_required
@@ -16,7 +16,6 @@
 router = APIRouter(
     prefix="/users",
     tags=["users"],
-    dependencies=[Depends(get_session)],
     responses={404: {"description": "Not found"}},
 )
 

backend/api/users/tasks.py

@@ -118,7 +118,7 @@ async def get(
         )
         sort_by = request.query_params.get("sort_by", "-action_date")
 
-        tasks = UserService.get_tasks_dto(
+        tasks = await UserService.get_tasks_dto(
             user.id,
             project_id=project_id,
             project_status=project_status,

backend/db.py

@@ -43,12 +43,6 @@ def create_db_session(self):
 db_connection = DatabaseConnection()  # Create a single instance
 
 
-# remove
-def get_session():
-    """Yield a new database session."""
-    return db_connection.create_db_session()
-
-
 async def get_db():
     """Get the database connection from the pool."""
     async with db_connection.database.connection() as connection:

backend/models/dtos/interests_dto.py

@@ -1,17 +1,6 @@
 from pydantic import BaseModel, Field
 from typing import Optional, List
 
-# class InterestDTO(Model):
-#     """DTO for a interest."""
-
-#     id = IntType()
-#     name = StringType(required=True, min_length=1)
-#     user_selected = BooleanType(
-#         serialized_name="userSelected", serialize_when_none=False
-#     )
-#     count_projects = IntType(serialize_when_none=False, serialized_name="countProjects")
-#     count_users = IntType(serialize_when_none=False, serialized_name="countUsers")
-
 
 class InterestDTO(BaseModel):
     id: Optional[int] = None

backend/models/dtos/project_dto.py

@@ -1,7 +1,5 @@
-# from schematics import Model
-# from schematics.exceptions import ValidationError
 from datetime import date, datetime
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union, Any
 
 from fastapi import HTTPException
 from pydantic import BaseModel, Field, root_validator
@@ -452,7 +450,7 @@ class Config:
 class ProjectSearchResultsDTO(BaseModel):
     """Contains all results for the search criteria"""
 
-    map_results: Optional[List] = Field(default_factory=list, alias="mapResults")
+    map_results: Optional[Any] = Field(default_factory=list, alias="mapResults")
     results: Optional[List["ListSearchResultDTO"]] = Field(default_factory=list)
     pagination: Optional["Pagination"] = Field(default_factory=dict)
 

backend/models/dtos/user_dto.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List, Optional
+from typing import List, Optional, Dict
 
 from pydantic import BaseModel, Field
 from pydantic.functional_validators import field_validator
@@ -154,7 +154,7 @@ class MappedProject(BaseModel):
     tasks_mapped: Optional[int] = Field(None, alias="tasksMapped")
     tasks_validated: Optional[int] = Field(None, alias="tasksValidated")
     status: Optional[str] = None
-    centroid: Optional[str] = None
+    centroid: Optional[Dict] = None
 
     class Config:
         populate_by_name = True

backend/models/postgis/application.py

@@ -10,13 +10,11 @@
     select,
 )
 
-from backend.db import Base, get_session
+from backend.db import Base
 from backend.models.dtos.application_dto import ApplicationDTO, ApplicationsDTO
 from backend.models.postgis.utils import timestamp
 from backend.services.users.authentication_service import AuthenticationService
 
-session = get_session()
-
 
 class Application(Base):
     """Describes an application that is authorized to access the TM"""
@@ -45,9 +43,6 @@ async def create(self, user_id, db: Database):
         await db.execute(query)
         return application
 
-    def save(self):
-        session.commit()
-
     async def delete(self, db: Database):
         query = delete(Application).where(Application.id == self.id)
         await db.execute(query)

backend/models/postgis/banner.py

@@ -3,11 +3,9 @@
 from markdown import markdown
 from sqlalchemy import Boolean, Column, Integer, String, insert, update
 
-from backend.db import Base, get_session
+from backend.db import Base
 from backend.models.dtos.banner_dto import BannerDTO
 
-session = get_session()
-
 
 class Banner(Base):
     """Model for Banners"""
@@ -26,10 +24,6 @@ async def create(self, db: Database):
         )
         await db.execute(query)
 
-    def update(self):
-        """Updates the current model in the DB"""
-        session.commit()
-
     async def update_from_dto(self, db: Database, dto: BannerDTO):
         """Updates the current model in the DB"""
         self.message = dto.message

backend/models/postgis/campaign.py

@@ -1,9 +1,8 @@
 from sqlalchemy import Column, ForeignKey, Integer, String, Table, UniqueConstraint
 
-from backend.db import Base, get_session
+from backend.db import Base
 from backend.models.dtos.campaign_dto import CampaignDTO, CampaignListDTO
 
-session = get_session()
 
 campaign_projects = Table(
     "campaign_projects",
@@ -34,27 +33,6 @@ class Campaign(Base):
     url = Column(String)
     description = Column(String)
 
-    def create(self):
-        """Creates and saves the current model to the DB"""
-        session.add(self)
-        session.commit()
-
-    def delete(self):
-        """Deletes the current model from the DB"""
-        session.delete(self)
-        session.commit()
-
-    def save(self):
-        session.commit()
-
-    def update(self, dto: CampaignDTO):
-        """Update the user details"""
-        self.name = dto.name if dto.name else self.name
-        self.logo = dto.logo if dto.logo else self.logo
-        self.url = dto.url if dto.url else self.url
-        self.description = dto.description if dto.description else self.description
-        session.commit()
-
     @classmethod
     def from_dto(cls, dto: CampaignDTO):
         """Creates new message from DTO"""

backend/models/postgis/custom_editors.py

@@ -1,11 +1,9 @@
 from databases import Database
 from sqlalchemy import Column, ForeignKey, Integer, String, delete, update
 
-from backend.db import Base, get_session
+from backend.db import Base
 from backend.models.dtos.project_dto import CustomEditorDTO
 
-session = get_session()
-
 
 class CustomEditor(Base):
     """Model for user defined editors for a project"""
@@ -16,20 +14,6 @@ class CustomEditor(Base):
     description = Column(String)
     url = Column(String, nullable=False)
 
-    def create(self):
-        """Creates and saves the current model to the DB"""
-        session.add(self)
-        session.commit()
-
-    def save(self):
-        """Save changes to db"""
-        session.commit()
-
-    @staticmethod
-    def get_by_project_id(project_id: int):
-        """Get custom editor by it's project id"""
-        return session.get(CustomEditor, project_id)
-
     @classmethod
     async def create_from_dto(cls, project_id: int, dto: CustomEditorDTO, db: Database):
         """Creates a new CustomEditor from dto, used in project edit"""

backend/models/postgis/interests.py

@@ -1,11 +1,9 @@
 from databases import Database
 from sqlalchemy import BigInteger, Column, ForeignKey, Integer, String, Table, select
 
-from backend.db import Base, get_session
-from backend.exceptions import NotFound
-from backend.models.dtos.interests_dto import InterestDTO, InterestsListDTO
+from backend.db import Base
+from backend.models.dtos.interests_dto import InterestDTO
 
-session = get_session()
 
 # Secondary table defining many-to-many join for interests of a user.
 user_interests = Table(
@@ -43,47 +41,10 @@ async def get_by_id(interest_id: int, db: Database):
             return Interest(**result)
         return None
 
-    @staticmethod
-    def get_by_name(name: str):
-        """Get interest by name"""
-        interest = session.query(Interest).filter(Interest.name == name).first()
-        if interest is None:
-            raise NotFound(sub_code="INTEREST_NOT_FOUND", interest_name=name)
-
-        return interest
-
-    def update(self, dto):
-        """Update existing interest"""
-        self.name = dto.name
-        session.commit()
-
-    def create(self):
-        """Creates and saves the current model to the DB"""
-        session.add(self)
-        session.commit()
-
-    def save(self):
-        """Save changes to db"""
-        session.commit()
-
-    def delete(self):
-        """Deletes the current model from the DB"""
-        session.delete(self)
-        session.commit()
-
     def as_dto(self) -> InterestDTO:
         """Get the interest from the DB"""
         dto = InterestDTO()
         dto.id = self.id
         dto.name = self.name
 
         return dto
-
-    @staticmethod
-    def get_all_interests():
-        """Get all interests"""
-        query = session.query(Interest).all()
-        interest_list_dto = InterestsListDTO()
-        interest_list_dto.interests = [interest.as_dto() for interest in query]
-
-        return interest_list_dto