fix openapi test

Author: bisgaard-itis

api/specs/web-server/_long_running_tasks.py

@@ -36,7 +36,7 @@
     description="Lists all long running tasks",
     responses=_data_export_responses,
 )
-def list_tasks(): ...
+def get_async_jobs(): ...
 
 
 @router.get(
@@ -46,7 +46,7 @@ def list_tasks(): ...
     description="Retrieves the status of a task",
     responses=_data_export_responses,
 )
-def get_task_status(
+def get_async_job_status(
     _path_params: Annotated[_PathParam, Depends()],
 ): ...
 
@@ -58,7 +58,7 @@ def get_task_status(
     responses=_data_export_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )
-def cancel_and_delete_task(
+def abort_async_job(
     _path_params: Annotated[_PathParam, Depends()],
 ): ...
 
@@ -69,6 +69,6 @@ def cancel_and_delete_task(
     description="Retrieves the result of a task",
     responses=_data_export_responses,
 )
-def get_task_result(
+def get_async_job_result(
     _path_params: Annotated[_PathParam, Depends()],
 ): ...

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -2980,7 +2980,7 @@ paths:
       - long-running-tasks
       summary: List Tasks
       description: Lists all long running tasks
-      operationId: list_tasks
+      operationId: get_async_jobs
       responses:
         '200':
           description: Successful Response
@@ -3018,7 +3018,7 @@ paths:
       - long-running-tasks
       summary: Get Task Status
       description: Retrieves the status of a task
-      operationId: get_task_status
+      operationId: get_async_job_status
       parameters:
       - name: task_id
         in: path
@@ -3062,7 +3062,7 @@ paths:
       - long-running-tasks
       summary: Cancel And Delete Task
       description: Cancels and deletes a task
-      operationId: cancel_and_delete_task
+      operationId: abort_async_job
       parameters:
       - name: task_id
         in: path
@@ -3103,7 +3103,7 @@ paths:
       - long-running-tasks
       summary: Get Task Result
       description: Retrieves the result of a task
-      operationId: get_task_result
+      operationId: get_async_job_result
       parameters:
       - name: task_id
         in: path

services/web/server/src/simcore_service_webserver/tasks/_rest.py

@@ -107,7 +107,7 @@ class _StorageAsyncJobId(BaseModel):
 
 
 @routes.get(
-    _task_prefix + "/{task_id}/status",
+    _task_prefix + "/{task_id}",
     name="get_async_job_status",
 )
 @login_required

services/web/server/tests/unit/with_dbs/01/storage/test_storage_rpc.py

@@ -157,7 +157,7 @@ async def test_get_async_jobs_status(
         backend_result_or_exception,
     )
 
-    response = await client.get(f"/{API_VERSION}/tasks/{_job_id}/status")
+    response = await client.get(f"/{API_VERSION}/tasks/{_job_id}")
     assert response.status == expected_status
     if response.status == status.HTTP_200_OK:
         response_body_data = (

services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py

@@ -13,6 +13,7 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.openapi_specs import Entrypoint
+from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.application import create_application
 from simcore_service_webserver.application_settings import get_application_settings
 from simcore_service_webserver.rest._utils import get_openapi_specs_path
@@ -75,7 +76,13 @@ def test_app_named_resources_against_openapi_specs(
     openapi_specs_entrypoints: set[Entrypoint],
     app_rest_entrypoints: set[Entrypoint],
 ):
-    assert app_rest_entrypoints == openapi_specs_entrypoints
+    # remove task-legacy routes. These should not be exposed.
+    required_entry_points = {
+        e
+        for e in app_rest_entrypoints
+        if not e.path.startswith(f"/{API_VTAG}/tasks-legacy")
+    }
+    assert required_entry_points == openapi_specs_entrypoints
 
     # NOTE: missing here is:
     # - input schemas (path, query and body)