@sanderegg review:drop organization and renames

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/simcore_webserver_groups_fixtures.py

@@ -21,8 +21,8 @@
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from simcore_service_webserver.groups._groups_api import (
     add_user_in_group,
-    create_organization,
-    delete_organization,
+    create_standard_group,
+    delete_group,
     list_user_groups_with_read_access,
 )
 
@@ -34,7 +34,7 @@ def _groupget_model_dump(group, access_rights) -> dict[str, Any]:
 async def _create_organization(
     app: web.Application, user_id: UserID, new_group: dict
 ) -> dict[str, Any]:
-    group, access_rights = await create_organization(
+    group, access_rights = await create_standard_group(
         app,
         user_id=user_id,
         create=OrganizationCreate.model_validate(new_group),
@@ -107,10 +107,10 @@ async def standard_groups_owner(
         yield owner_user
 
         # clean groups
-        await delete_organization(
+        await delete_group(
             client.app, user_id=owner_user["id"], group_id=sparc_group["gid"]
         )
-        await delete_organization(
+        await delete_group(
             client.app, user_id=owner_user["id"], group_id=team_black_group["gid"]
         )
 

services/web/server/src/simcore_service_webserver/groups/_groups_api.py

@@ -91,7 +91,7 @@ async def get_product_group_for_user(
 #
 
 
-async def create_organization(
+async def create_standard_group(
     app: web.Application,
     *,
     user_id: UserID,
@@ -101,7 +101,7 @@ async def create_organization(
     raises GroupNotFoundError
     raises UserInsufficientRightsError
     """
-    return await _groups_db.create_user_group(
+    return await _groups_db.create_standard_group(
         app,
         user_id=user_id,
         create=create,
@@ -123,7 +123,7 @@ async def get_organization(
     return await _groups_db.get_user_group(app, user_id=user_id, group_9d=group_id)
 
 
-async def update_organization(
+async def update_group(
     app: web.Application,
     *,
     user_id: UserID,
@@ -144,7 +144,7 @@ async def update_organization(
     )
 
 
-async def delete_organization(
+async def delete_group(
     app: web.Application, *, user_id: UserID, group_id: GroupID
 ) -> None:
     """

services/web/server/src/simcore_service_webserver/groups/_groups_db.py

@@ -15,6 +15,7 @@
 )
 from models_library.users import GroupID, UserID
 from simcore_postgres_database.errors import UniqueViolation
+from simcore_postgres_database.models.groups import GroupType
 from simcore_postgres_database.utils_products import execute_get_or_create_product_group
 from simcore_postgres_database.utils_repos import (
     pass_or_acquire_connection,
@@ -247,7 +248,7 @@ async def get_product_group_for_user(
 assert set(OrganizationCreate.model_fields).issubset({c.name for c in groups.columns})
 
 
-async def create_user_group(
+async def create_standard_group(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
@@ -265,7 +266,10 @@ async def create_user_group(
         result = await conn.stream(
             # pylint: disable=no-value-for-parameter
             groups.insert()
-            .values(**create.model_dump(mode="json", exclude_unset=True))
+            .values(
+                **create.model_dump(mode="json", exclude_unset=True),
+                type=GroupType.STANDARD,
+            )
             .returning(*_GROUP_COLUMNS)
         )
         row = await result.fetchone()

services/web/server/src/simcore_service_webserver/groups/_groups_handlers.py

@@ -102,12 +102,12 @@ async def get_group(request: web.Request):
 @permission_required("groups.*")
 @handle_plugin_requests_exceptions
 async def create_group(request: web.Request):
-    """Creates organization groups"""
+    """Creates standard groups"""
     req_ctx = GroupsRequestContext.model_validate(request)
 
     create = await parse_request_body_as(GroupCreate, request)
 
-    group, access_rights = await _groups_api.create_organization(
+    group, access_rights = await _groups_api.create_standard_group(
         request.app,
         user_id=req_ctx.user_id,
         create=create.to_model(),
@@ -122,12 +122,12 @@ async def create_group(request: web.Request):
 @permission_required("groups.*")
 @handle_plugin_requests_exceptions
 async def update_group(request: web.Request):
-    """Updates organization groups"""
+    """Updates groups metadata"""
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
     update: GroupUpdate = await parse_request_body_as(GroupUpdate, request)
 
-    group, access_rights = await _groups_api.update_organization(
+    group, access_rights = await _groups_api.update_group(
         request.app,
         user_id=req_ctx.user_id,
         group_id=path_params.gid,
@@ -147,7 +147,7 @@ async def delete_group(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
 
-    await _groups_api.delete_organization(
+    await _groups_api.delete_group(
         request.app, user_id=req_ctx.user_id, group_id=path_params.gid
     )
 

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -36,7 +36,7 @@
 from simcore_service_webserver.director_v2.plugin import setup_director_v2
 from simcore_service_webserver.garbage_collector import _core as gc_core
 from simcore_service_webserver.garbage_collector.plugin import setup_garbage_collector
-from simcore_service_webserver.groups._groups_api import create_organization
+from simcore_service_webserver.groups._groups_api import create_standard_group
 from simcore_service_webserver.groups.api import add_user_in_group
 from simcore_service_webserver.login.plugin import setup_login
 from simcore_service_webserver.projects._crud_api_delete import get_scheduled_tasks
@@ -282,7 +282,7 @@ async def get_group(client: TestClient, user: dict):
     """Creates a group for a given user"""
     assert client.app
 
-    return await create_organization(
+    return await create_standard_group(
         app=client.app,
         user_id=user["id"],
         create=OrganizationCreate.model_validate(

services/web/server/tests/unit/with_dbs/01/groups/test_groups_handlers_users.py

@@ -22,8 +22,8 @@
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.groups._groups_api import (
-    create_organization,
-    delete_organization,
+    create_standard_group,
+    delete_group,
 )
 from simcore_service_webserver.groups._groups_db import (
     _DEFAULT_GROUP_OWNER_ACCESS_RIGHTS,
@@ -460,7 +460,7 @@ async def group_where_logged_user_is_the_owner(
     logged_user: UserInfoDict,
 ) -> AsyncIterator[Group]:
     assert client.app
-    group, _ = await create_organization(
+    group, _ = await create_standard_group(
         app=client.app,
         user_id=logged_user["id"],
         create=OrganizationCreate.model_validate(
@@ -474,7 +474,7 @@ async def group_where_logged_user_is_the_owner(
 
     yield group
 
-    await delete_organization(client.app, user_id=logged_user["id"], group_id=group.gid)
+    await delete_group(client.app, user_id=logged_user["id"], group_id=group.gid)
 
 
 @pytest.mark.acceptance_test(