fix issues after resolving conflicts

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

@@ -29,15 +29,17 @@
     DynamicServiceStart,
     DynamicServiceStop,
 )
-from models_library.api_schemas_webserver.projects import ProjectGet, ProjectPatch
+from models_library.api_schemas_webserver.projects import (
+    ProjectDocument,
+    ProjectGet,
+    ProjectPatch,
+)
 from models_library.basic_types import KeyIDStr
 from models_library.errors import ErrorDict
 from models_library.groups import GroupID
 from models_library.products import ProductName
-from models_library.projects import (
-    Project,
-    ProjectID,
-)
+from models_library.projects import Project, ProjectID, ProjectTemplateType
+from models_library.projects import ProjectType as ProjectTypeAPI
 from models_library.projects_access import Owner
 from models_library.projects_nodes import Node, NodeState, PartialNode
 from models_library.projects_nodes_io import NodeID, NodeIDStr, PortLink
@@ -82,8 +84,10 @@
     ServiceWasNotFoundError,
 )
 from servicelib.redis import (
+    PROJECT_DB_UPDATE_REDIS_LOCK_KEY,
     exclusive,
     get_project_locked_state,
+    increment_and_return_project_document_version,
     is_project_locked,
     with_project_locked,
 )
@@ -103,6 +107,7 @@
 from ..products import products_web
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..redis import (
+    get_redis_document_manager_client_sdk,
     get_redis_lock_manager_client_sdk,
 )
 from ..resource_manager.user_sessions import (
@@ -142,6 +147,7 @@
 from ._nodes_utils import set_reservation_same_as_limit, validate_new_service_resources
 from ._projects_repository_legacy import APP_PROJECT_DBAPI, ProjectDBAPI
 from ._projects_repository_legacy_utils import PermissionStr
+from ._socketio import notify_project_document_updated
 from .exceptions import (
     ClustersKeeperNotAvailableError,
     DefaultPricingUnitNotFoundError,
@@ -169,6 +175,81 @@
 PROJECT_REDIS_LOCK_KEY: str = "project:{}"
 
 
+async def patch_project_and_notify_users(
+    app: web.Application,
+    *,
+    project_uuid: ProjectID,
+    patch_project_data: dict[str, Any],
+    user_primary_gid: GroupID,
+) -> None:
+    """
+    Patches a project and notifies users involved in the project with version control.
+
+    This function performs the following operations atomically:
+    1. Patches the project in the database
+    2. Retrieves the updated project with workbench
+    3. Creates a project document
+    4. Increments the document version
+    5. Notifies users about the project update
+
+    Args:
+        app: The web application instance
+        project_uuid: The project UUID to patch
+        patch_project_data: Dictionary containing the project data to patch
+        user_primary_gid: Primary group ID of the user making the change
+
+    Note:
+        This function is decorated with Redis exclusive lock to ensure
+        thread-safe operations on the project document.
+    """
+
+    @exclusive(
+        get_redis_lock_manager_client_sdk(app),
+        lock_key=PROJECT_DB_UPDATE_REDIS_LOCK_KEY.format(project_uuid),
+        blocking=True,
+        blocking_timeout=datetime.timedelta(seconds=30),
+    )
+    async def _patch_and_notify() -> None:
+        await _projects_repository.patch_project(
+            app=app,
+            project_uuid=project_uuid,
+            new_partial_project_data=patch_project_data,
+        )
+        project_with_workbench = await _projects_repository.get_project_with_workbench(
+            app=app, project_uuid=project_uuid
+        )
+        project_document = ProjectDocument(
+            uuid=project_with_workbench.uuid,
+            workspace_id=project_with_workbench.workspace_id,
+            name=project_with_workbench.name,
+            description=project_with_workbench.description,
+            thumbnail=project_with_workbench.thumbnail,
+            last_change_date=project_with_workbench.last_change_date,
+            classifiers=project_with_workbench.classifiers,
+            dev=project_with_workbench.dev,
+            quality=project_with_workbench.quality,
+            workbench=project_with_workbench.workbench,
+            ui=project_with_workbench.ui,
+            type=cast(ProjectTypeAPI, project_with_workbench.type),
+            template_type=cast(
+                ProjectTemplateType, project_with_workbench.template_type
+            ),
+        )
+        redis_client_sdk = get_redis_document_manager_client_sdk(app)
+        document_version = await increment_and_return_project_document_version(
+            redis_client=redis_client_sdk, project_uuid=project_uuid
+        )
+        await notify_project_document_updated(
+            app=app,
+            project_id=project_uuid,
+            user_primary_gid=user_primary_gid,
+            version=document_version,
+            document=project_document,
+        )
+
+    await _patch_and_notify()
+
+
 def _is_node_dynamic(node_key: str) -> bool:
     return "/dynamic/" in node_key
 
@@ -349,10 +430,10 @@ async def patch_project_for_user(
 
     # 5. If patching template type
     if new_template_type := patch_project_data.get("template_type"):
-        # 4.1 Check if user is a tester
+        # 5.1 Check if user is a tester
         if UserRole(current_user["role"]) < UserRole.TESTER:
             raise InsufficientRoleForProjectTemplateTypeUpdateError
-        # 4.2 Check the compatibility of the template type with the project
+        # 5.2 Check the compatibility of the template type with the project
         if project_db.type == ProjectType.STANDARD and new_template_type is not None:
             raise ProjectTypeAndTemplateIncompatibilityError(
                 project_uuid=project_uuid,