fix: tests

Author: JanssenBrm

app/auth.py

@@ -76,10 +76,12 @@ async def websocket_authenticate(websocket: WebSocket) -> str | None:
         return None
     except Exception as e:
         logger.error(f"Unexpected error occurred during websocket authentication: {e}")
-        await WSStatusMessage(
-            type="error",
-            message="Something went wrong during authentication. Please try again.",
-        ).model_dump()
+        await websocket.send_json(
+            WSStatusMessage(
+                type="error",
+                message="Something went wrong during authentication. Please try again.",
+            ).model_dump()
+        )
         await websocket.close(code=1008, reason="INTERNAL_ERROR")
         return None
 
@@ -160,7 +162,9 @@ async def exchange_token_for_provider(
         raise AuthException(
             http_status=client_status,
             message=(
-                f"Please link your account with {provider} in your <a href='https://{settings.keycloak_host}/realms/{settings.keycloak_realm}/account'>Account Dashboard</a>"
+                f"Please link your account with {provider} in your "
+                "<a href='https://{settings.keycloak_host}/realms/{settings.keycloak_realm}/"
+                "account'>Account Dashboard</a>"
                 if body.get("error", "") == "not_linked"
                 else f"Could not authenticate with {provider}: {err}"
             ),

app/error.py

@@ -45,7 +45,7 @@ class AuthException(DispatcherException):
     def __init__(
         self,
         http_status: Optional[int] = status.HTTP_401_UNAUTHORIZED,
-        message: Optional[Dict[str, Any]] = "Authentication failed.",
+        message: Optional[str] = "Authentication failed.",
     ):
         super().__init__(message, "AUTHENTICATION_FAILED", http_status)
 

app/routers/jobs_status.py

@@ -119,13 +119,15 @@ async def ws_jobs_status(
         await websocket.send_json(
             WSStatusMessage(type="error", message=ae.message).model_dump()
         )
-        await websocket.close(code=1008, reason=ae.error_code)
+        await websocket.close(code=1011, reason=ae.error_code)
     except Exception as e:
         logger.error(f"Unexpected error occurred during websocket : {e}")
-        await WSStatusMessage(
-            type="error",
-            message="An error occurred while monitoring the job status.",
-        ).model_dump()
-        await websocket.close(code=1008, reason="INTERNAL_ERROR")
+        await websocket.send_json(
+            WSStatusMessage(
+                type="error",
+                message="An error occurred while monitoring the job status.",
+            ).model_dump()
+        )
+        await websocket.close(code=1011, reason="INTERNAL_ERROR")
     finally:
         db.close()

app/routers/sync_jobs.py

@@ -1,5 +1,5 @@
 from typing import Annotated
-from fastapi import Body, APIRouter, Depends, HTTPException, Response, status
+from fastapi import Body, APIRouter, Depends, Response, status
 from loguru import logger
 
 from app.error import DispatcherException, ErrorResponse, InternalException

app/routers/tiles.py

@@ -1,5 +1,5 @@
 from typing import Annotated
-from fastapi import APIRouter, HTTPException, status, Body
+from fastapi import APIRouter, status, Body
 from geojson_pydantic import GeometryCollection, Polygon
 from loguru import logger
 

app/routers/unit_jobs.py

@@ -1,12 +1,11 @@
 from typing import Annotated
-from fastapi import Body, APIRouter, Depends, HTTPException, status
+from fastapi import Body, APIRouter, Depends, status
 from loguru import logger
 from sqlalchemy.orm import Session
 
 from app.auth import oauth2_scheme
 from app.database.db import get_db
 from app.error import (
-    AuthException,
     DispatcherException,
     ErrorResponse,
     InternalException,

app/routers/upscale_tasks.py

@@ -6,7 +6,6 @@
     Body,
     APIRouter,
     Depends,
-    HTTPException,
     WebSocket,
     WebSocketDisconnect,
     status,
@@ -255,16 +254,18 @@ async def ws_task_status(
                 type="error", task_id=task_id, message=ae.message
             ).model_dump()
         )
-        await websocket.close(code=1008, reason=ae.error_code)
+        await websocket.close(code=1011, reason=ae.error_code)
     except Exception as e:
         logger.error(
             f"An error occurred while monitoring upscaling task {task_id}: {e}"
         )
-        await WSTaskStatusMessage(
-            type="error",
-            task_id=task_id,
-            message="An error occurred while monitoring upscaling task.",
-        ).model_dump()
-        await websocket.close(code=1008, reason="INTERNAL_ERROR")
+        await websocket.send_json(
+            WSTaskStatusMessage(
+                type="error",
+                task_id=task_id,
+                message="An error occurred while monitoring upscaling task.",
+            ).model_dump()
+        )
+        await websocket.close(code=1011, reason="INTERNAL_ERROR")
     finally:
         db.close()

tests/routers/test_job_status.py

@@ -103,5 +103,6 @@ async def test_ws_jobs_status_closes_on_error(mock_get_jobs_status, client):
             websocket.receive_json()
             websocket.receive_json()
             websocket.receive_json()
+            websocket.receive_json()
 
         assert exc_info.value.code == 1011

tests/routers/test_sync_jobs.py

@@ -1,7 +1,9 @@
 import json
 from unittest.mock import patch
 
-from fastapi import HTTPException
+from fastapi import status
+
+from app.error import InternalException
 
 
 @patch("app.routers.sync_jobs.create_synchronous_job")
@@ -27,21 +29,19 @@ def test_sync_jobs_create_500(
     mock_create_sync_job.side_effect = SystemError("Could not launch the job")
 
     r = client.post("/sync_jobs", json=fake_processing_job_request.model_dump())
-    assert r.status_code == 500
-    assert "could not launch the job" in r.json().get("detail", "").lower()
+    assert r.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+    assert "An error occurred while creating the synchronous job." in r.json().get("message", "")
 
 
 @patch("app.routers.sync_jobs.create_synchronous_job")
-def test_sync_jobs_create_http_error(
+def test_sync_jobs_create_internal_error(
     mock_create_sync_job,
     client,
     fake_processing_job_request,
 ):
 
-    mock_create_sync_job.side_effect = HTTPException(
-        status_code=503, detail="Oops, service unavailable"
-    )
+    mock_create_sync_job.side_effect = InternalException()
 
     r = client.post("/sync_jobs", json=fake_processing_job_request.model_dump())
-    assert r.status_code == 503
-    assert "service unavailable" in r.json().get("detail", "").lower()
+    assert r.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+    assert "An internal server error occurred." in r.json().get("message", "")

tests/routers/test_tiles.py

@@ -1,6 +1,7 @@
 from unittest.mock import patch
 import pytest
 from app.schemas.tiles import GridTypeEnum
+from fastapi import status
 
 
 @pytest.fixture
@@ -28,5 +29,5 @@ def test_split_in_tiles_success(client, dummy_payload):
 def test_split_in_tiles_unknown_grid(mock_split, client, dummy_payload):
     mock_split.side_effect = ValueError("Unknown grid: INVALID_GRID")
     response = client.post("/tiles", json=dummy_payload)
-    assert response.status_code == 500
-    assert "Unknown grid" in response.json()["detail"]
+    assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+    assert "An error occurred while calculating tiles for 20x20km" in response.json()["message"]