changed api

Author: sanderegg

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

@@ -13931,35 +13931,6 @@ components:
       - service_key
       - running_time_in_hours
       title: OsparcCreditsAggregatedByServiceGet
-    Owner:
-      properties:
-        user_id:
-          type: integer
-          exclusiveMinimum: true
-          title: User Id
-          description: Owner's user id
-          minimum: 0
-        first_name:
-          anyOf:
-          - type: string
-            maxLength: 255
-          - type: 'null'
-          title: First Name
-          description: Owner's first name
-        last_name:
-          anyOf:
-          - type: string
-            maxLength: 255
-          - type: 'null'
-          title: Last Name
-          description: Owner's last name
-      additionalProperties: false
-      type: object
-      required:
-      - user_id
-      - first_name
-      - last_name
-      title: Owner
     PageLinks:
       properties:
         self:
@@ -15521,26 +15492,6 @@ components:
       - workspaceId
       - folderId
       title: ProjectListItem
-    ProjectLocked:
-      properties:
-        value:
-          type: boolean
-          title: Value
-          description: True if the project is locked
-        status:
-          $ref: '#/components/schemas/ProjectStatus'
-          description: The status of the project
-        owner:
-          anyOf:
-          - $ref: '#/components/schemas/Owner'
-          - type: 'null'
-          description: If locked, the user that owns the lock
-      additionalProperties: false
-      type: object
-      required:
-      - value
-      - status
-      title: ProjectLocked
     ProjectMetadataGet:
       properties:
         projectUuid:
@@ -15768,18 +15719,43 @@ components:
       - shareeEmail
       - confirmationLink
       title: ProjectShareAccepted
-    ProjectState:
+    ProjectShareState:
       properties:
+        status:
+          $ref: '#/components/schemas/ProjectStatus'
+          description: The status of the project
         locked:
-          $ref: '#/components/schemas/ProjectLocked'
+          type: boolean
+          title: Locked
+          description: True if the project is locked
+        current_user_groupids:
+          items:
+            type: integer
+            exclusiveMinimum: true
+            minimum: 0
+          type: array
+          title: Current User Groupids
+          description: Current users in the project (if the project is locked, the
+            list contains only the lock owner)
+      additionalProperties: false
+      type: object
+      required:
+      - status
+      - locked
+      - current_user_groupids
+      title: ProjectShareState
+    ProjectState:
+      properties:
+        share_state:
+          $ref: '#/components/schemas/ProjectShareState'
           description: The project lock state
         state:
           $ref: '#/components/schemas/ProjectRunningState'
           description: The project running state
       additionalProperties: false
       type: object
       required:
-      - locked
+      - share_state
       - state
       title: ProjectState
     ProjectStatus:

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

@@ -34,7 +34,7 @@
 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, ProjectIDStr
+from models_library.projects import Project, ProjectID
 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
@@ -275,7 +275,7 @@ async def update_project_last_change_timestamp(
 ):
     db: ProjectDBAPI = app[APP_PROJECT_DBAPI]
     assert db  # nosec
-    await db.update_project_last_change_timestamp(ProjectIDStr(f"{project_uuid}"))
+    await db.update_project_last_change_timestamp(f"{project_uuid}")
 
 
 async def patch_project(
@@ -1577,7 +1577,7 @@ async def get_project_states_for_user(
 ) -> ProjectState:
     # for templates: the project is never locked and never opened. also the running state is always unknown
     running_state = RunningState.UNKNOWN
-    lock_state, computation_task = await logged_gather(
+    share_state, computation_task = await logged_gather(
         _get_project_share_state(user_id, project_uuid, app),
         director_v2_service.get_computation_task(app, user_id, UUID(project_uuid)),
     )
@@ -1586,7 +1586,7 @@ async def get_project_states_for_user(
         running_state = computation_task.state
 
     return ProjectState(
-        locked=lock_state, state=ProjectRunningState(value=running_state)
+        share_state=share_state, state=ProjectRunningState(value=running_state)
     )
 
 
@@ -1603,7 +1603,7 @@ async def add_project_states_for_user(
         f"{project['uuid']=}",
     )
     # for templates: the project is never locked and never opened. also the running state is always unknown
-    lock_state = await _get_project_share_state(user_id, project["uuid"], app)
+    share_state = await _get_project_share_state(user_id, project["uuid"], app)
     running_state = RunningState.UNKNOWN
 
     if not is_template and (
@@ -1629,7 +1629,7 @@ async def add_project_states_for_user(
             prj_node.update({"progress": round(prj_node_progress * 100.0)})
 
     project["state"] = ProjectState(
-        locked=lock_state, state=ProjectRunningState(value=running_state)
+        share_state=share_state, state=ProjectRunningState(value=running_state)
     ).model_dump(by_alias=True, exclude_unset=True)
     return project