test: added test for routers (#3)

Author: JanssenBrm

.gitignore

@@ -178,7 +178,7 @@ cython_debug/
 #  that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
 #  and can be added to the global gitignore or merged into this file. However, if you prefer, 
 #  you could uncomment the following to ignore the enitre vscode folder
-# .vscode/
+ .vscode/
 
 # Ruff stuff:
 .ruff_cache/

alembic/versions/adc8ba536dea_add_label_to_processing_jobs.py

@@ -1,8 +1,8 @@
-"""Create processing jobs table
+"""Creation of processing jobs
 
-Revision ID: 3b5001cdded8
+Revision ID: b3ba8db2adef
 Revises: 
-Create Date: 2025-08-11 14:50:01.851507
+Create Date: 2025-08-13 09:37:59.014491
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = '3b5001cdded8'
+revision: str = 'b3ba8db2adef'
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -23,19 +23,21 @@ def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('processing_jobs',
     sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('title', sa.String(), nullable=True),
-    sa.Column('status', sa.Enum('CREATED', 'RUNNING', 'FINISHED', 'FAILED', name='processingstatusenum'), nullable=True),
-    sa.Column('user_id', sa.String(), nullable=True),
+    sa.Column('title', sa.String(), nullable=False),
+    sa.Column('label', sa.Enum('OPENEO', 'OGC_API_PROCESS', name='processtypeenum'), nullable=False),
+    sa.Column('status', sa.Enum('CREATED', 'RUNNING', 'FINISHED', 'FAILED', name='processingstatusenum'), nullable=False),
+    sa.Column('user_id', sa.String(), nullable=False),
     sa.Column('platform_job_id', sa.String(), nullable=True),
     sa.Column('parameters', sa.String(), nullable=True),
     sa.Column('result_link', sa.String(), nullable=True),
     sa.Column('service_record', sa.String(), nullable=True),
-    sa.Column('created', sa.DateTime(), nullable=True),
-    sa.Column('updated', sa.DateTime(), nullable=True),
+    sa.Column('created', sa.DateTime(), nullable=False),
+    sa.Column('updated', sa.DateTime(), nullable=False),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_processing_jobs_created'), 'processing_jobs', ['created'], unique=False)
     op.create_index(op.f('ix_processing_jobs_id'), 'processing_jobs', ['id'], unique=False)
+    op.create_index(op.f('ix_processing_jobs_label'), 'processing_jobs', ['label'], unique=False)
     op.create_index(op.f('ix_processing_jobs_platform_job_id'), 'processing_jobs', ['platform_job_id'], unique=False)
     op.create_index(op.f('ix_processing_jobs_service_record'), 'processing_jobs', ['service_record'], unique=False)
     op.create_index(op.f('ix_processing_jobs_status'), 'processing_jobs', ['status'], unique=False)
@@ -54,6 +56,7 @@ def downgrade() -> None:
     op.drop_index(op.f('ix_processing_jobs_status'), table_name='processing_jobs')
     op.drop_index(op.f('ix_processing_jobs_service_record'), table_name='processing_jobs')
     op.drop_index(op.f('ix_processing_jobs_platform_job_id'), table_name='processing_jobs')
+    op.drop_index(op.f('ix_processing_jobs_label'), table_name='processing_jobs')
     op.drop_index(op.f('ix_processing_jobs_id'), table_name='processing_jobs')
     op.drop_index(op.f('ix_processing_jobs_created'), table_name='processing_jobs')
     op.drop_table('processing_jobs')

…01cdded8_create_processing_jobs_table.py …a8db2adef_creation_of_processing_jobs.pyalembic/versions/3b5001cdded8_create_processing_jobs_table.py renamed to alembic/versions/b3ba8db2adef_creation_of_processing_jobs.py alembic/versions/3b5001cdded8_create_processing_jobs_table.py renamed to alembic/versions/b3ba8db2adef_creation_of_processing_jobs.py

@@ -13,18 +13,19 @@
 
 @router.get(
     "/jobs_status",
-    response_model=JobsStatusResponse,
     tags=["Upscale Tasks", "Unit Jobs"],
     summary="Get a list of all upscaling tasks & processing jobs for the authenticated user",
 )
 async def jobs_status(
     db: Session = Depends(get_db),
     user: str = "foobar",
-):
+) -> JobsStatusResponse:
     """
     Return combined list of upscaling tasks and processing jobs for the authenticated user.
     """
     logger.debug(f"Fetching jobs list for user {user}")
+    processing_jobs = get_processing_jobs_by_user_id(db, user)
+    print(processing_jobs)
     return JobsStatusResponse(
-        upscalingTasks=[], processingJobs=get_processing_jobs_by_user_id(db, user)
+        upscaling_tasks=[], processing_jobs=get_processing_jobs_by_user_id(db, user)
     )

app/routers/jobs_status.py

@@ -15,31 +15,32 @@
 
 @router.post(
     "/unit_jobs",
-    response_model=ProcessingJobSummary,
     status_code=status.HTTP_201_CREATED,
     tags=["Unit Jobs"],
     summary="Create a new processing job",
 )
 async def create_unit_job(
     payload: BaseJobRequest, db: Session = Depends(get_db), user: str = "foobar"
-):
+) -> ProcessingJobSummary:
     """Create a new processing job with the provided data."""
     try:
         return create_processing_job(db, user, payload)
     except Exception as e:
-        logger.error(f"Error creating unit job: {e}")
+        logger.error(f"Error creating unit job for user {user}: {e}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=f"An error occurred while creating the processing job: {e}",
         )
 
 
-@router.get("/unit_jobs/{job_id}", response_model=ProcessingJob, tags=["Unit Jobs"])
-async def get_job(job_id: int, db: Session = Depends(get_db), user: str = "foobar"):
+@router.get("/unit_jobs/{job_id}", tags=["Unit Jobs"])
+async def get_job(
+    job_id: int, db: Session = Depends(get_db), user: str = "foobar"
+) -> ProcessingJob:
     job = get_processing_job_by_user_id(db, job_id, user)
     if not job:
         raise HTTPException(
             status_code=404,
-            detail={"code": "NotFound", "message": "Processing job not found"},
+            detail=f"Processing job {job_id} not found",
         )
     return job

app/routers/unit_jobs.py

@@ -15,6 +15,7 @@ class ProcessingStatusEnum(str, Enum):
     FINISHED = "finished"
     FAILED = "failed"
 
+
 # class TileRequest(BaseModel):
 #     aoi: dict
 #     grid: str
@@ -76,8 +77,8 @@ class UpscalingTaskSummary(BaseModel):
 
 
 class JobsStatusResponse(BaseModel):
-    upscalingTasks: List[UpscalingTaskSummary] = []
-    processingJobs: List[ProcessingJobSummary] = []
+    upscaling_tasks: List[UpscalingTaskSummary] = []
+    processing_jobs: List[ProcessingJobSummary] = []
 
 
 class BaseJobRequest(BaseModel):

app/schemas.py

@@ -1,10 +1,19 @@
+from datetime import datetime
 from unittest.mock import MagicMock
 
 import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session
 
 from app.main import app
+from app.schemas import (
+    BaseJobRequest,
+    ProcessTypeEnum,
+    ProcessingJob,
+    ProcessingJobSummary,
+    ProcessingStatusEnum,
+    ServiceDetails,
+)
 
 
 @pytest.fixture
@@ -18,6 +27,38 @@ def fake_db_session():
     return MagicMock(spec=Session)
 
 
+@pytest.fixture
+def fake_processing_job_request():
+    return BaseJobRequest(
+        title="Test Job",
+        label=ProcessTypeEnum.OPENEO,
+        service=ServiceDetails(service="foo", application="bar"),
+        parameters={},
+    )
+
+
+@pytest.fixture
+def fake_processing_job_summary():
+    return ProcessingJobSummary(
+        id=1,
+        title="Test Job",
+        label=ProcessTypeEnum.OPENEO,
+        status=ProcessingStatusEnum.CREATED,
+    )
+
+
+@pytest.fixture
+def fake_processing_job(fake_processing_job_summary, fake_processing_job_request):
+    return ProcessingJob(
+        **(fake_processing_job_summary.model_dump()),
+        service=fake_processing_job_request.service,
+        parameters=fake_processing_job_request.parameters,
+        result_link="https://foo.bar",
+        created=datetime.now(),
+        updated=datetime.now()
+    )
+
+
 # @pytest.fixture(autouse=True)
 # def disable_auth(monkeypatch):
 #     # Replace auth.get_current_user dependency with a stub for tests

tests/conftest.py

@@ -0,0 +1,21 @@
+import json
+from unittest.mock import patch
+
+
+from app.schemas import (
+    JobsStatusResponse,
+)
+
+
+@patch("app.routers.jobs_status.get_processing_jobs_by_user_id")
+def test_unit_jobs_get_200(
+    mock_get_processing_jobs, client, fake_processing_job_summary
+):
+
+    mock_get_processing_jobs.return_value = [fake_processing_job_summary]
+
+    r = client.get("/jobs_status")
+    assert r.status_code == 200
+    assert json.dumps(r.json(), indent=1) == JobsStatusResponse(
+        upscaling_tasks=[], processing_jobs=[fake_processing_job_summary]
+    ).model_dump_json(indent=1)

tests/test_health.py tests/routers/test_health.pytests/test_health.py renamed to tests/routers/test_health.py

@@ -0,0 +1,61 @@
+import json
+from unittest.mock import patch
+
+
+@patch("app.routers.unit_jobs.create_processing_job")
+def test_unit_jobs_create_201(
+    mock_create_processing_job,
+    client,
+    fake_processing_job_request,
+    fake_processing_job_summary,
+):
+
+    mock_create_processing_job.return_value = fake_processing_job_summary
+
+    r = client.post("/unit_jobs", json=fake_processing_job_request.model_dump())
+    assert r.status_code == 201
+    assert r.json() == fake_processing_job_summary.model_dump()
+
+
+@patch("app.routers.unit_jobs.create_processing_job")
+def test_unit_jobs_create_500(
+    mock_create_processing_job,
+    client,
+    fake_processing_job_request,
+):
+
+    mock_create_processing_job.side_effect = SystemError("Could not launch the job")
+
+    r = client.post("/unit_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()
+
+
+@patch("app.routers.unit_jobs.get_processing_job_by_user_id")
+def test_unit_jobs_get_job_200(
+    mock_get_processing_job,
+    client,
+    fake_processing_job,
+):
+
+    mock_get_processing_job.return_value = fake_processing_job
+
+    r = client.get("/unit_jobs/1")
+    assert r.status_code == 200
+    assert json.dumps(r.json(), indent=1) == fake_processing_job.model_dump_json(
+        indent=1
+    )
+
+
+@patch("app.routers.unit_jobs.get_processing_job_by_user_id")
+def test_unit_jobs_get_job_404(
+    mock_get_processing_job,
+    client,
+    fake_processing_job,
+):
+
+    mock_get_processing_job.return_value = None
+
+    r = client.get("/unit_jobs/1")
+    assert r.status_code == 404
+    assert "processing job 1 not found" in r.json().get("detail", "").lower()