ensure test passes

Author: bisgaard-itis

services/web/server/src/simcore_service_webserver/functions/_functions_repository.py

@@ -255,7 +255,7 @@ async def patch_function_job(  # noqa: PLR0913
         )
         result = await transaction.execute(
             function_jobs_table.update()
-            .where(function_jobs_table.c.uuid == registered_function_job_db.uuid)
+            .where(function_jobs_table.c.uuid == f"{registered_function_job_db.uuid}")
             .values(
                 inputs=registered_function_job_db.inputs,
                 outputs=registered_function_job_db.outputs,

services/web/server/src/simcore_service_webserver/functions/_functions_service.py

@@ -121,16 +121,13 @@ async def patch_registered_function_job(
 
     patched_job = _patch_functionjob(job, registered_function_job_patch)
 
-    await _functions_repository.patch_function_job(
+    result = await _functions_repository.patch_function_job(
         app=app,
-        function_job_uuid=function_job_uuid,
         user_id=user_id,
         product_name=product_name,
-        title=title,
-        description=description,
-        class_specific_data=class_specific_data,
+        registered_function_job_db=patched_job,
     )
-    return _decode_functionjob(job)
+    return _decode_functionjob(result)
 
 
 async def register_function_job_collection(
@@ -762,7 +759,7 @@ def _decode_functionjob(
         return RegisteredProjectFunctionJob(
             uid=functionjob_db.uuid,
             title=functionjob_db.title,
-            description="",
+            description=functionjob_db.description,
             function_uid=functionjob_db.function_uuid,
             inputs=functionjob_db.inputs,
             outputs=functionjob_db.outputs,
@@ -777,7 +774,7 @@ def _decode_functionjob(
         return RegisteredSolverFunctionJob(
             uid=functionjob_db.uuid,
             title=functionjob_db.title,
-            description="",
+            description=functionjob_db.description,
             function_uid=functionjob_db.function_uuid,
             inputs=functionjob_db.inputs,
             outputs=functionjob_db.outputs,
@@ -809,10 +806,16 @@ def _patch_functionjob(
             outputs=function_job_db.outputs,
             created=function_job_db.created,
             class_specific_data=FunctionClassSpecificData(
-                project_job_id=patch.project_job_id
-                or function_job_db.class_specific_data.get("project_job_id"),
-                job_creation_task_id=patch.job_creation_task_id
-                or function_job_db.class_specific_data.get("job_creation_task_id"),
+                project_job_id=(
+                    f"{patch.project_job_id}"
+                    if patch.project_job_id
+                    else function_job_db.class_specific_data.get("project_job_id")
+                ),
+                job_creation_task_id=(
+                    f"{patch.job_creation_task_id}"
+                    if patch.job_creation_task_id
+                    else function_job_db.class_specific_data.get("job_creation_task_id")
+                ),
             ),
         )
     elif function_job_db.function_class == FunctionClass.SOLVER:
@@ -827,10 +830,16 @@ def _patch_functionjob(
             outputs=function_job_db.outputs,
             created=function_job_db.created,
             class_specific_data=FunctionClassSpecificData(
-                solver_job_id=patch.solver_job_id
-                or function_job_db.class_specific_data.get("solver_job_id"),
-                job_creation_task_id=patch.job_creation_task_id
-                or function_job_db.class_specific_data.get("job_creation_task_id"),
+                solver_job_id=(
+                    f"{patch.solver_job_id}"
+                    if patch.solver_job_id
+                    else function_job_db.class_specific_data.get("solver_job_id")
+                ),
+                job_creation_task_id=(
+                    f"{patch.job_creation_task_id}"
+                    if patch.job_creation_task_id
+                    else function_job_db.class_specific_data.get("job_creation_task_id")
+                ),
             ),
         )
     elif function_job_db.function_class == FunctionClass.PYTHON_CODE:

services/web/server/tests/unit/with_dbs/04/functions/test_function_jobs_controller_rpc.py

@@ -2,7 +2,7 @@
 # pylint: disable=unused-argument
 
 import datetime
-from uuid import UUID, uuid4
+from uuid import uuid4
 
 import pytest
 from aiohttp.test_utils import TestClient
@@ -16,6 +16,7 @@
     FunctionClass,
     FunctionJobCollection,
     FunctionJobStatus,
+    RegisteredProjectFunctionJobPatch,
 )
 from models_library.functions_errors import (
     FunctionJobIDNotFoundError,
@@ -24,7 +25,9 @@
     FunctionJobWriteAccessDeniedError,
 )
 from models_library.products import ProductName
+from models_library.projects import ProjectID
 from pytest_simcore.helpers.webserver_users import UserInfoDict
+from servicelib.celery.models import TaskID
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.webserver.functions import (
     functions_rpc_interface as functions_rpc,
@@ -474,30 +477,25 @@ async def test_patch_registered_function_jobs(
         product_name=osparc_product_name,
     )
 
-    added_data = {"job_creation_task_id": f"{uuid4()}"}
-
-    registered_job = await functions_rpc.patch_registered_function_job(
-        rabbitmq_rpc_client=rpc_client,
-        user_id=logged_user["id"],
-        function_job_uuid=registered_job.uid,
-        product_name=osparc_product_name,
-        job_creation_task_id=added_data["job_creation_task_id"],
+    patch = RegisteredProjectFunctionJobPatch(
+        title=_faker.word(),
+        description=_faker.sentence(),
+        project_job_id=ProjectID(_faker.uuid4()),
+        job_creation_task_id=TaskID(_faker.uuid4()),
     )
-    assert registered_job.function_class == FunctionClass.PROJECT
-    assert registered_job.job_creation_task_id == added_data["job_creation_task_id"]
-
-    added_data.update(project_job_id=f"{uuid4()}")
 
     registered_job = await functions_rpc.patch_registered_function_job(
         rabbitmq_rpc_client=rpc_client,
         user_id=logged_user["id"],
         function_job_uuid=registered_job.uid,
         product_name=osparc_product_name,
-        project_job_id=added_data["project_job_id"],
+        registered_function_job_patch=patch,
     )
     assert registered_job.function_class == FunctionClass.PROJECT
-    assert registered_job.job_creation_task_id == added_data["job_creation_task_id"]
-    assert registered_job.project_job_id == UUID(added_data["project_job_id"])
+    assert registered_job.title == patch.title
+    assert registered_job.description == patch.description
+    assert registered_job.job_creation_task_id == patch.job_creation_task_id
+    assert registered_job.project_job_id == patch.project_job_id
 
 
 @pytest.mark.parametrize(