Fix create and delete organisation

src/backend/app/db/models.py

@@ -352,9 +352,6 @@ async def one(cls, db: Connection, org_identifier: int | str) -> Self:
                 )
                 db_org = await cur.fetchone()
 
-        if db_org is None:
-            raise KeyError(f"Organisation ({org_identifier}) not found.")
-
         return db_org
 
     @classmethod
@@ -397,7 +394,7 @@ async def create(
         # Set requesting user to the org owner
         org_in.created_by = user_id
 
-        if not ignore_conflict and cls.one(db, org_in.name):
+        if not ignore_conflict and await cls.one(db, org_in.name):
             msg = f"Organisation named ({org_in.name}) already exists!"
             log.warning(f"User ({user_id}) failed organisation creation: {msg}")
             raise HTTPException(status_code=HTTPStatus.CONFLICT, detail=msg)
@@ -536,6 +533,7 @@ async def delete(cls, db: Connection, org_id: int) -> bool:
                 settings.S3_BUCKET_NAME,
                 f"/{org_id}/",
             )
+            return True
 
     @classmethod
     async def unapproved(cls, db: Connection) -> Optional[list[Self]]:

src/backend/app/organisations/organisation_crud.py

@@ -19,12 +19,13 @@
 
 from fastapi import UploadFile
 from psycopg import Connection
+from psycopg.rows import class_row
 
 from app.auth.auth_schemas import AuthUser
 from app.config import settings
 from app.db.enums import MappingLevel, UserRole
 from app.db.models import DbOrganisation, DbOrganisationManagers, DbUser
-from app.organisations.organisation_schemas import OrganisationIn
+from app.organisations.organisation_schemas import OrganisationIn, OrganisationOut
 from app.users.user_schemas import UserIn
 
 
@@ -97,14 +98,12 @@ async def get_my_organisations(
     Returns:
         list[dict]: A list of organisation objects to be serialised.
     """
-    user_id = current_user.id
-
     sql = """
         SELECT DISTINCT org.*
         FROM organisations org
         JOIN organisation_managers managers
             ON managers.organisation_id = org.id
-        WHERE managers.user_id = :user_id
+        WHERE managers.user_id = %(user_id)s
 
         UNION
 
@@ -114,7 +113,6 @@ async def get_my_organisations(
             ON project.organisation_id = org.id
         WHERE project.author_id = %(user_id)s;
     """
-    async with db.cursor() as cur:
-        await cur.execute(sql, {"user_id": user_id})
-        orgs = cur.fetchall()
-    return orgs
+    async with db.cursor(row_factory=class_row(OrganisationOut)) as cur:
+        await cur.execute(sql, {"user_id": current_user.id})
+        return await cur.fetchall()

src/backend/app/organisations/organisation_deps.py

@@ -58,6 +58,8 @@ async def get_organisation(
             pass
         db_org = await DbOrganisation.one(db, id)
 
+        if db_org is None:
+            raise KeyError(f"Organisation ({id}) not found.")
     except KeyError as e:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail=str(e)) from e
 

src/backend/app/organisations/organisation_routes.py

@@ -23,6 +23,7 @@
     APIRouter,
     Depends,
     File,
+    HTTPException,
     Response,
     UploadFile,
 )
@@ -99,7 +100,7 @@ async def create_organisation(
     Either a logo can be uploaded, or a link to the logo provided
     in the Organisation JSON ('logo': 'https://your.link.to.logo.png').
     """
-    return DbOrganisation.create(db, org_in, current_user.id, logo)
+    return await DbOrganisation.create(db, org_in, current_user.id, logo)
 
 
 @router.patch("/{org_id}/", response_model=OrganisationOut)
@@ -120,19 +121,14 @@ async def delete_org(
     org_user_dict: Annotated[AuthUser, Depends(org_admin)],
 ):
     """Delete an organisation."""
-    org = org_user_dict.get("org")
-    deleted_org_id = await DbOrganisation.delete(db, org.id)
-
-    if not deleted_org_id:
-        return Response(
+    org_deleted = await DbOrganisation.delete(db, org_user_dict.id)
+    if not org_deleted:
+        log.error(f"Failed deleting org ({org_user_dict.name}).")
+        raise HTTPException(
             status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
-            details=f"Failed deleting org {(org.name)}.",
+            detail=f"Failed deleting org ({org_user_dict.name}).",
         )
-
-    return Response(
-        status_code=HTTPStatus.NO_CONTENT,
-        details=f"Deleted org {(org.deleted_org_id)}.",
-    )
+    return Response(status_code=HTTPStatus.NO_CONTENT)
 
 
 @router.delete("/unapproved/{org_id}")
@@ -148,11 +144,17 @@ async def delete_unapproved_org(
     will also check if the organisation is approved and error if it's not.
     This is an ADMIN-only endpoint for deleting unapproved orgs.
     """
-    await DbOrganisation.delete(db, org_id)
-    return Response(
-        status_code=HTTPStatus.NO_CONTENT,
-        detail=f"Deleted org ({org_id}).",
-    )
+    org_deleted = await DbOrganisation.delete(db, org_id)
+
+    if not org_deleted:
+        log.error(f"Failed deleting org ({org_id}).")
+        raise HTTPException(
+            status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+            detail=f"Failed deleting org ({org_id}).",
+        )
+
+    log.info(f"Successfully deleted org ({org_id}).")
+    return Response(status_code=HTTPStatus.NO_CONTENT)
 
 
 @router.post("/approve/", response_model=OrganisationOut)