Fix tests

Author: wvangeit

services/api-server/openapi.json

@@ -9954,42 +9954,42 @@
                 {
                   "oneOf": [
                     {
-                      "$ref": "#/components/schemas/RegisteredProjectFunctionJob"
+                      "$ref": "#/components/schemas/RegisteredProjectFunctionJobWithStatus"
                     },
                     {
-                      "$ref": "#/components/schemas/RegisteredPythonCodeFunctionJob"
+                      "$ref": "#/components/schemas/RegisteredPythonCodeFunctionJobWithStatus"
                     },
                     {
-                      "$ref": "#/components/schemas/RegisteredSolverFunctionJob"
+                      "$ref": "#/components/schemas/RegisteredSolverFunctionJobWithStatus"
                     }
                   ],
                   "discriminator": {
                     "propertyName": "function_class",
                     "mapping": {
-                      "PROJECT": "#/components/schemas/RegisteredProjectFunctionJob",
-                      "PYTHON_CODE": "#/components/schemas/RegisteredPythonCodeFunctionJob",
-                      "SOLVER": "#/components/schemas/RegisteredSolverFunctionJob"
+                      "PROJECT": "#/components/schemas/RegisteredProjectFunctionJobWithStatus",
+                      "PYTHON_CODE": "#/components/schemas/RegisteredPythonCodeFunctionJobWithStatus",
+                      "SOLVER": "#/components/schemas/RegisteredSolverFunctionJobWithStatus"
                     }
                   }
                 },
                 {
                   "oneOf": [
                     {
-                      "$ref": "#/components/schemas/RegisteredProjectFunctionJobWithStatus"
+                      "$ref": "#/components/schemas/RegisteredProjectFunctionJob"
                     },
                     {
-                      "$ref": "#/components/schemas/RegisteredPythonCodeFunctionJobWithStatus"
+                      "$ref": "#/components/schemas/RegisteredPythonCodeFunctionJob"
                     },
                     {
-                      "$ref": "#/components/schemas/RegisteredSolverFunctionJobWithStatus"
+                      "$ref": "#/components/schemas/RegisteredSolverFunctionJob"
                     }
                   ],
                   "discriminator": {
                     "propertyName": "function_class",
                     "mapping": {
-                      "PROJECT": "#/components/schemas/RegisteredProjectFunctionJobWithStatus",
-                      "PYTHON_CODE": "#/components/schemas/RegisteredPythonCodeFunctionJobWithStatus",
-                      "SOLVER": "#/components/schemas/RegisteredSolverFunctionJobWithStatus"
+                      "PROJECT": "#/components/schemas/RegisteredProjectFunctionJob",
+                      "PYTHON_CODE": "#/components/schemas/RegisteredPythonCodeFunctionJob",
+                      "SOLVER": "#/components/schemas/RegisteredSolverFunctionJob"
                     }
                   }
                 }

services/api-server/src/simcore_service_api_server/api/routes/function_jobs_routes.py

@@ -137,7 +137,7 @@ async def list_function_jobs(
     ] = False,
 ):
     if include_status:
-        function_jobs_list, meta = (
+        function_jobs_list_ws, meta = (
             await function_job_service.list_function_jobs_with_status(
                 pagination_offset=page_params.offset,
                 pagination_limit=page_params.limit,
@@ -148,7 +148,7 @@ async def list_function_jobs(
         )
         # the code below should ideally be in the service layer, but this can only be done if the
         # celery status resolution is done in the service layer too
-        for function_job_wso in function_jobs_list:
+        for function_job_wso in function_jobs_list_ws:
             if (
                 function_job_wso.status.status
                 not in (
@@ -180,7 +180,7 @@ async def list_function_jobs(
                     )
 
         return create_page(
-            function_jobs_list,
+            function_jobs_list_ws,
             total=meta.total,
             params=page_params,
         )

services/api-server/src/simcore_service_api_server/models/domain/functions.py

@@ -15,7 +15,7 @@ class PreRegisteredFunctionJobData(BaseModel):
 
 
 class PageRegisteredFunctionJobWithorWithoutStatus(
-    Page[RegisteredFunctionJob | RegisteredFunctionJobWithStatus]
+    Page[RegisteredFunctionJobWithStatus | RegisteredFunctionJob]  # order is important
 ):
     # This class is created specifically to provide a name for this in openapi.json.
     # When using an alias the python-client generates too long file name