removed full name from lock owner

Author: sanderegg

packages/models-library/src/models_library/projects_access.py

@@ -1,18 +1,16 @@
 """
-    Ownership and access rights
+Ownership and access rights
 """
 
 from enum import Enum
 
 from pydantic import BaseModel, ConfigDict, Field
-from pydantic.types import PositiveInt
 
 from .basic_types import IDStr
-from .users import FirstNameStr, LastNameStr
+from .users import UserID
 
 
-class GroupIDStr(IDStr):
-    ...
+class GroupIDStr(IDStr): ...
 
 
 class AccessEnum(str, Enum):
@@ -30,18 +28,15 @@ class AccessRights(BaseModel):
 
 
 class Owner(BaseModel):
-    user_id: PositiveInt = Field(..., description="Owner's user id")
-    first_name: FirstNameStr | None = Field(..., description="Owner's first name")
-    last_name: LastNameStr | None = Field(..., description="Owner's last name")
+    user_id: UserID = Field(..., description="Owner's user id")
 
     model_config = ConfigDict(
         extra="forbid",
         json_schema_extra={
             "examples": [
-                # NOTE: None and empty string are both defining an undefined value
-                {"user_id": 1, "first_name": None, "last_name": None},
-                {"user_id": 2, "first_name": "", "last_name": ""},
-                {"user_id": 3, "first_name": "John", "last_name": "Smith"},
+                {"user_id": 1},
+                {"user_id": 42},
+                {"user_id": 666},
             ]
         },
     )

services/web/server/src/simcore_service_webserver/exporter/_handlers.py

@@ -18,7 +18,6 @@
 from ..projects._projects_service import create_user_notification_cb
 from ..redis import get_redis_lock_manager_client_sdk
 from ..security.decorators import permission_required
-from ..users import users_service
 from ._formatter.archive import get_sds_archive_path
 from .exceptions import SDSException
 from .utils import CleanupFileResponse
@@ -51,10 +50,7 @@ async def export_project(request: web.Request):
         get_redis_lock_manager_client_sdk(request.app),
         project_uuid=project_uuid,
         status=ProjectStatus.EXPORTING,
-        owner=Owner(
-            user_id=user_id,
-            **await users_service.get_user_fullname(request.app, user_id=user_id),
-        ),
+        owner=Owner(user_id=user_id),
         notification_cb=create_user_notification_cb(
             user_id, ProjectID(f"{project_uuid}"), request.app
         ),

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

@@ -38,7 +38,6 @@
     copy_data_folders_from_project,
     get_project_total_size_simcore_s3,
 )
-from ..users import users_service
 from ..workspaces.api import check_user_workspace_access, get_user_workspace
 from ..workspaces.errors import WorkspaceAccessForbiddenError
 from . import _folders_repository, _projects_repository, _projects_service
@@ -203,10 +202,7 @@ async def _copy() -> None:
             get_redis_lock_manager_client_sdk(app),
             project_uuid=source_project["uuid"],
             status=ProjectStatus.CLONING,
-            owner=Owner(
-                user_id=user_id,
-                **await users_service.get_user_fullname(app, user_id=user_id),
-            ),
+            owner=Owner(user_id=user_id),
             notification_cb=_projects_service.create_user_notification_cb(
                 user_id, ProjectID(f"{source_project['uuid']}"), app
             ),

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

@@ -129,7 +129,6 @@
 )
 from ..users import users_service
 from ..users.exceptions import UserDefaultWalletNotFoundError, UserNotFoundError
-from ..users.users_service import FullNameDict
 from ..wallets import api as wallets_service
 from ..wallets.errors import WalletNotEnoughCreditsError
 from ..workspaces import _workspaces_repository as workspaces_workspaces_repository
@@ -1498,10 +1497,7 @@ async def try_open_project_for_user(
             get_redis_lock_manager_client_sdk(app),
             project_uuid=project_uuid,
             status=ProjectStatus.OPENING,
-            owner=Owner(
-                user_id=user_id,
-                **await users_service.get_user_fullname(app, user_id=user_id),
-            ),
+            owner=Owner(user_id=user_id),
             notification_cb=None,
         )
         async def _open_project() -> bool:
@@ -1983,7 +1979,6 @@ async def remove_project_dynamic_services(
     simcore_user_agent: str,
     *,
     notify_users: bool = True,
-    user_name: FullNameDict | None = None,
 ) -> None:
     """
 
@@ -1999,10 +1994,6 @@ async def remove_project_dynamic_services(
         user_id,
     )
 
-    user_name_data: FullNameDict = user_name or await users_service.get_user_fullname(
-        app, user_id=user_id
-    )
-
     user_role: UserRole | None = None
     try:
         user_role = await users_service.get_user_role(app, user_id=user_id)
@@ -2020,7 +2011,7 @@ async def remove_project_dynamic_services(
         get_redis_lock_manager_client_sdk(app),
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,
-        owner=Owner(user_id=user_id, **user_name_data),
+        owner=Owner(user_id=user_id),
         notification_cb=(
             create_user_notification_cb(user_id, ProjectID(project_uuid), app)
             if notify_users

services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py

@@ -232,6 +232,6 @@ async def test_delete_project_while_it_is_locked_raises_error(
         get_redis_lock_manager_client_sdk(client.app),
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,
-        owner=Owner(user_id=user_id, first_name=faker.name(), last_name=faker.name()),
+        owner=Owner(user_id=user_id),
         notification_cb=None,
     )(_request_delete_project)(client, user_project, expected.conflict)

services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager.py

@@ -938,7 +938,6 @@ async def test_regression_removing_unexisting_user(
         user_id=user_id,
         project_uuid=empty_user_project["uuid"],
         app=client.app,
-        user_name={"first_name": "my name is", "last_name": "pytest"},
         simcore_user_agent=UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
     )
     # since the call to delete is happening as fire and forget task, let's wait until it is done