revered

Author: pcrespov

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

@@ -2,7 +2,6 @@
 
 from aiohttp import web
 from common_library.json_serialization import json_dumps
-from models_library.api_schemas_catalog.services import MyServiceGet
 from models_library.api_schemas_webserver.projects import (
     EmptyModel,
     ProjectCopyOverride,
@@ -40,6 +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 . import _rest_utils
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import (
@@ -55,6 +55,12 @@
     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__)
 
 
@@ -271,34 +277,25 @@ async def get_project(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    # 1. Get project if user has access
+    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
+        )
+    )
+
     project = await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
         include_state=True,
         include_trashed_by_primary_gid=True,
     )
-
-    # 2. Check if user has access to all services within the project
-    services_in_project = {
-        (srv["key"], srv["version"]) for _, srv in project.get("workbench", {}).items()
-    }
-
-    my_services: list[MyServiceGet] = await catalog_service.batch_get_my_services(
-        request.app,
-        product_name=req_ctx.product_name,
-        user_id=req_ctx.user_id,
-        services_ids=list(services_in_project),
-    )
-
-    not_my_services = services_in_project.difference(
-        {(srv.key, srv.release.version) for srv in my_services}
-    )
-
-    if not_my_services:
+    if not await project_uses_available_services(project, user_available_services):
+        unavilable_services = get_project_unavailable_services(
+            project, user_available_services
+        )
         formatted_services = ", ".join(
-            f"{service}:{version}" for service, version in not_my_services
+            f"{service}:{version}" for service, version in unavilable_services
         )
         # TODO: lack of permissions should be notified with https://httpstatuses.com/403 web.HTTPForbidden
         raise web.HTTPNotFound(
@@ -308,7 +305,10 @@ async def get_project(request: web.Request):
             )
         )
 
-    # 3. Adds permalink
+    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)
 
     data = ProjectGet.from_domain_model(project).data(exclude_unset=True)