undo function

Author: pcrespov

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

@@ -14,7 +14,7 @@
 from ..scicrunch.service_client import SciCrunch
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
-from ._classifiers_api import GroupClassifierRepository, build_rrids_tree_view
+from ._classifiers_service import GroupClassifierRepository, build_rrids_tree_view
 from ._common.exceptions_handlers import handle_plugin_requests_exceptions
 from ._common.schemas import GroupsClassifiersQuery, GroupsPathParams
 

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

@@ -1,11 +1,9 @@
 import re
 from copy import deepcopy
-from datetime import datetime
 
 import sqlalchemy as sa
 from aiohttp import web
 from common_library.groups_enums import GroupType
-from common_library.users_enums import UserRole, UserStatus
 from models_library.basic_types import IDStr
 from models_library.groups import (
     AccessRightsDict,
@@ -17,7 +15,6 @@
     StandardGroupCreate,
     StandardGroupUpdate,
 )
-from models_library.products import ProductName
 from models_library.users import UserID
 from simcore_postgres_database.errors import UniqueViolation
 from simcore_postgres_database.models.users import users
@@ -751,34 +748,3 @@ async def auto_add_user_to_product_group(
             .on_conflict_do_nothing()  # in case the user was already added to this group
         )
         return product_group_id
-
-
-async def auto_create_guest_user_and_add_to_product_group(
-    app: web.Application,
-    connection: AsyncConnection | None = None,
-    *,
-    random_user_name: str,
-    email: str,
-    password_hash: str,
-    expires_at: datetime,
-    product_name: ProductName,
-):
-    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
-        query = (
-            users.insert()
-            .values(
-                name=random_user_name,
-                email=email,
-                password_hash=password_hash,
-                status=UserStatus.ACTIVE,
-                role=UserRole.GUEST,
-                expires_at=expires_at,
-            )
-            .returning(users.c.id)
-        )
-
-        user_id = await conn.scalar(query)
-
-        await auto_add_user_to_product_group(
-            app, connection, user_id=user_id, product_name=product_name
-        )

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

@@ -233,11 +233,6 @@ async def auto_add_user_to_product_group(
     )
 
 
-auto_create_guest_user_and_add_to_product_group = (
-    _groups_repository.auto_create_guest_user_and_add_to_product_group
-)
-
-
 def _only_one_true(*args):
     return sum(bool(arg) for arg in args) == 1
 

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

@@ -5,7 +5,7 @@
 
 from .._constants import APP_SETTINGS_KEY
 from ..products.plugin import setup_products
-from . import _classifiers_handlers, _groups_rest
+from . import _classifiers_rest, _groups_rest
 
 _logger = logging.getLogger(__name__)
 
@@ -24,4 +24,4 @@ def setup_groups(app: web.Application):
     setup_products(app)
 
     app.router.add_routes(_groups_rest.routes)
-    app.router.add_routes(_classifiers_handlers.routes)
+    app.router.add_routes(_classifiers_rest.routes)

services/web/server/tests/unit/with_dbs/01/test_groups_classifiers.py

@@ -8,7 +8,9 @@
 import sqlalchemy as sa
 from servicelib.common_aiopg_utils import DataSourceName, create_pg_engine
 from simcore_service_webserver._constants import APP_AIOPG_ENGINE_KEY
-from simcore_service_webserver.groups._classifiers_api import GroupClassifierRepository
+from simcore_service_webserver.groups._classifiers_service import (
+    GroupClassifierRepository,
+)
 from sqlalchemy.sql import text