get_specific_job_result_endpoint update

Author: alinbutu

services/staging/rs_server_staging/main.py

@@ -25,6 +25,11 @@
 from fastapi import APIRouter, FastAPI, HTTPException, Path
 from pygeoapi.api import API
 from pygeoapi.process.manager.postgresql import PostgreSQLManager
+from pygeoapi.process.base import (
+    JobNotFoundError,
+    JobResultNotFoundError,
+    ProcessorGenericError
+)
 from pygeoapi.provider.postgresql import get_engine
 from rs_server_common.authentication.authentication_to_external import (
     init_rs_server_config_yaml,
@@ -44,6 +49,7 @@
     HTTP_200_OK,
     HTTP_404_NOT_FOUND,
     HTTP_503_SERVICE_UNAVAILABLE,
+    HTTP_500_INTERNAL_SERVER_ERROR,
 )
 
 # flake8: noqa: F401
@@ -314,12 +320,25 @@ async def delete_job_endpoint(job_id: str = Path(..., title="The ID of the job t
 @router.get("/jobs/{job_id}/results")
 async def get_specific_job_result_endpoint(job_id: str = Path(..., title="The ID of the job")):
     """Get result from a specific job."""
-    # Query the database to find the job by job_id
-    job = app.extra["process_manager"].get_job(job_id)
-    if job:
+    try:
+        # Query the database to find the job by job_id
+        job = app.extra["process_manager"].get_job(job_id)
         return JSONResponse(status_code=HTTP_200_OK, content=job["status"])
-
-    raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail=f"Job with ID {job_id} not found")
+    except JobNotFoundError:
+        # Handle case when job_id is not found
+        return JSONResponse(
+            status_code=HTTP_404_NOT_FOUND,
+            content={
+                "title": "No Such Job",
+                "detail": f"Job with ID {job_id} not found."
+            }
+        )
+    except Exception as e:
+        # Catch any other unexpected exceptions
+        return JSONResponse(
+            status_code=HTTP_500_INTERNAL_SERVER_ERROR,
+            content={"title": "Internal Server Error", "detail": str(e)}
+        )
 
 
 # Configure OpenTelemetry

services/staging/tests/test_staging.py

@@ -29,6 +29,13 @@
     HTTP_200_OK,
     HTTP_404_NOT_FOUND,
     HTTP_503_SERVICE_UNAVAILABLE,
+    HTTP_500_INTERNAL_SERVER_ERROR,
+)
+
+from pygeoapi.process.base import (
+    JobNotFoundError,
+    JobResultNotFoundError,
+    ProcessorGenericError
 )
 
 expected_jobs_test = [
@@ -72,6 +79,14 @@
         "created": "unknown",
         "updated": "unknown",
     },
+    {
+        "identifier": "trigger_500",
+        "status": "error",
+        "progress": 0.0,
+        "message": "This job will trigger an internal server error.",
+        "created": "unknown",
+        "updated": "unknown",
+    },
 ]
 
 
@@ -306,20 +321,42 @@ async def test_get_job_result(
     """
     # Mock app.extra to ensure 'db_table' exists
     mock_db_table = mocker.MagicMock()
-    try:
-        job_index = next(i for i, job in enumerate(mock_jobs) if job["identifier"] == expected_job["identifier"])
+    
+    if expected_job["identifier"] == "non_existing":
+        # Simulate JobNotFoundError for non-existing jobs (HTTP 404)
+        mock_db_table.get_job.side_effect = JobNotFoundError
+        expected_status = HTTP_404_NOT_FOUND
+        expected_response = {
+            "title": "No Such Job",
+            "detail": f"Job with ID {expected_job['identifier']} not found.",
+        }
+    elif expected_job["identifier"] == "trigger_500":
+        # Simulate an unexpected exception (HTTP 500)
+        mock_db_table.get_job.side_effect = Exception("Unexpected error occurred")
+        expected_status = HTTP_500_INTERNAL_SERVER_ERROR
+        expected_response = {
+            "title": "Internal Server Error",
+            "detail": "Unexpected error occurred",
+        }
+    else:
+        # Return an existing job normally (HTTP 200)
+        job_index = next(
+            i for i, job in enumerate(mock_jobs) if job["identifier"] == expected_job["identifier"]
+        )
         mock_db_table.get_job.return_value = mock_jobs[job_index]
-    except StopIteration:
-        mock_db_table.get_job.return_value = []
+        expected_status = HTTP_200_OK
+        expected_response = expected_job["status"]
+    
     # Patch app.extra with the mock db_table
     mocker.patch.object(staging_client.app, "extra", {"process_manager": mock_db_table})
 
     # Call the API
-    response = staging_client.get(f"/jobs/{expected_job['identifier']}/results")
-    # assert response is OK and job info match, or not found for last case
-    assert (
-        response.status_code == HTTP_200_OK and response.json() == expected_job["status"]
-    ) or response.status_code == HTTP_404_NOT_FOUND
+    job_id = expected_job.get("identifier")  
+    response = staging_client.get(f"/jobs/{job_id}/results")
+    
+    # Assert response status code and content
+    assert response.status_code == expected_status
+    assert response.json() == expected_response
 
 
 @pytest.mark.asyncio