uses projects

Author: pcrespov

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py

@@ -39,7 +39,7 @@
 from .. import _crud_api_create, _crud_api_read, _projects_service
 from .._permalink_service import update_or_pop_permalink_in_project
 from ..models import ProjectDict
-from ..utils import get_project_unavailable_services, project_uses_available_services
+from ..utils import are_project_services_available, get_project_unavailable_services
 from . import _rest_utils
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import (
@@ -55,12 +55,6 @@
     ProjectsSearchQueryParams,
 )
 
-# When the user requests a project with a repo, the working copy might differ from
-# the repo project. A middleware in the meta module (if active) will resolve
-# the working copy and redirect to the appropriate project entrypoint. Nonetheless, the
-# response needs to refer to the uuid of the request and this is passed through this request key
-RQ_REQUESTED_REPO_PROJECT_UUID_KEY = f"{__name__}.RQT_REQUESTED_REPO_PROJECT_UUID_KEY"
-
 _logger = logging.getLogger(__name__)
 
 
@@ -277,10 +271,8 @@ async def get_project(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    user_available_services: list[dict] = (
-        await catalog_service.get_services_for_user_in_product(
-            request.app, req_ctx.user_id, req_ctx.product_name, only_key_versions=True
-        )
+    user_available_services = await catalog_service.list_user_services_with_versions(
+        request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
     )
 
     project = await _projects_service.get_project_for_user(
@@ -290,7 +282,8 @@ async def get_project(request: web.Request):
         include_state=True,
         include_trashed_by_primary_gid=True,
     )
-    if not await project_uses_available_services(project, user_available_services):
+
+    if not are_project_services_available(project, user_available_services):
         unavilable_services = get_project_unavailable_services(
             project, user_available_services
         )
@@ -305,9 +298,6 @@ async def get_project(request: web.Request):
             )
         )
 
-    if new_uuid := request.get(RQ_REQUESTED_REPO_PROJECT_UUID_KEY):
-        project["uuid"] = new_uuid
-
     # Adds permalink
     await update_or_pop_permalink_in_project(request, project)