feat: added service information in job details

Author: JanssenBrm

app/schemas/unit_job.py

@@ -42,6 +42,9 @@ class ProcessingJobSummary(BaseModel):
         description="Current status of the processing job",
         examples=[ProcessingStatusEnum.RUNNING],
     )
+    service: ServiceDetails = Field(
+        ..., description="Details of the service to be executed"
+    )
     parameters: dict = Field(
         ...,
         description="JSON representing the parameters for the service execution",
@@ -50,9 +53,6 @@ class ProcessingJobSummary(BaseModel):
 
 
 class ProcessingJobDetails(BaseModel):
-    service: ServiceDetails = Field(
-        ..., description="Details of the service to be executed"
-    )
     created: datetime = Field(..., description="Creation time of the processing job")
     updated: datetime = Field(
         ...,

app/schemas/upscale_task.py

@@ -26,7 +26,11 @@ class UpscalingTaskSummary(BaseModel):
 
 class UpscalingTaskDetails(BaseModel):
     service: ServiceDetails = Field(
-        ..., description="Details of the service to be executed"
+        ...,
+        description="Details of the service to be executed",
+        examples=[
+            ServiceDetails(endpoint="https://platform.eo/", application="my-app")
+        ],
     )
     created: datetime = Field(..., description="Creation time of the processing job")
     updated: datetime = Field(
@@ -44,13 +48,19 @@ class UpscalingTaskDetails(BaseModel):
                     label=ProcessTypeEnum.OPENEO,
                     status=ProcessingStatusEnum.FINISHED,
                     parameters={"param1": "value1", "param2": "value2"},
+                    service=ServiceDetails(
+                        endpoint="https://platform.eo/", application="my-app"
+                    ),
                 ),
                 ProcessingJobSummary(
                     id=1,
                     title="Upscaling Job 2",
                     label=ProcessTypeEnum.OPENEO,
                     status=ProcessingStatusEnum.RUNNING,
                     parameters={"param1": "value1", "param2": "value2"},
+                    service=ServiceDetails(
+                        endpoint="https://platform.eo/", application="my-app"
+                    ),
                 ),
             ]
         ],

app/services/processing.py

@@ -67,6 +67,7 @@ def create_processing_job(
         label=request.label,
         status=record.status,
         parameters=request.parameters,
+        service=request.service,
     )
 
 
@@ -131,6 +132,7 @@ def get_processing_jobs_by_user_id(
                 label=record.label,
                 status=record.status,
                 parameters=json.loads(record.parameters),
+                service=ServiceDetails.model_validate_json(record.service or "{}"),
             )
         )
     return jobs

tests/conftest.py

@@ -63,14 +63,14 @@ def fake_processing_job_summary():
         label=ProcessTypeEnum.OPENEO,
         status=ProcessingStatusEnum.CREATED,
         parameters={"param1": "value1", "param2": "value2"},
+        service=ServiceDetails(endpoint="foo", application="bar"),
     )
 
 
 @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,
         created=datetime.now(),
         updated=datetime.now()
     )

tests/services/test_processing.py

@@ -63,6 +63,7 @@ def test_create_processing_job_calls_platform_execute(
         label=ProcessTypeEnum.OPENEO,
         status=ProcessingStatusEnum.CREATED,
         parameters=fake_job.parameters,
+        service=fake_job.service,
     )
     fake_record = ProcessingJobRecord(
         id=fake_result,
@@ -108,6 +109,7 @@ def test_create_processing_job_calls_platform_execute_failure(
         label=ProcessTypeEnum.OPENEO,
         status=ProcessingStatusEnum.CREATED,
         parameters=fake_job.parameters,
+        service=fake_job.service,
     )
     fake_record = ProcessingJobRecord(
         id=fake_result,
@@ -166,7 +168,7 @@ def test_get_processing_jobs_with_active_and_inactive_statuses(
         title="Finished Job",
         status=ProcessingStatusEnum.FAILED,
         parameters="{}",
-        service=json.dumps({"foo": "bar"}),
+        service=json.dumps({"application": "foo", "endpoint": "bar"}),
     )
     mock_get_jobs.return_value = [fake_processing_job_record, inactive_job]
     mock_get_job_status.return_value = ProcessingStatusEnum.RUNNING
@@ -222,7 +224,7 @@ def test_get_processing_jobs_with_finished_statuses(
         label=ProcessTypeEnum.OGC_API_PROCESS,
         title="Finished Job",
         status=ProcessingStatusEnum.FINISHED,
-        service=json.dumps({"foo": "bar"}),
+        service=json.dumps({"application": "foo", "endpoint": "bar"}),
         parameters="{}",
     )
     finished_job_result = ProcessingJobRecord(
@@ -231,7 +233,7 @@ def test_get_processing_jobs_with_finished_statuses(
         label=ProcessTypeEnum.OGC_API_PROCESS,
         title="Finished Job",
         status=ProcessingStatusEnum.FINISHED,
-        service=json.dumps({"foo": "bar"}),
+        service=json.dumps({"application": "foo", "endpoint": "bar"}),
         parameters="{}",
     )
     mock_get_jobs.return_value = [finished_job_no_result, finished_job_result]

tests/services/test_upscaling.py

@@ -6,6 +6,7 @@
 from app.schemas.unit_job import (
     BaseJobRequest,
     ProcessingJobSummary,
+    ServiceDetails,
 )
 from app.services.upscaling import (
     _get_upscale_status,
@@ -24,6 +25,7 @@ def make_job(status: ProcessingStatusEnum) -> ProcessingJobSummary:
         status=status,
         label=ProcessTypeEnum.OPENEO,
         parameters={"param1": "value1", "param2": "value2"},
+        service=ServiceDetails(endpoint="foo.bar", application="my-app"),
     )