renames

Author: pcrespov

api/specs/web-server/_users.py

@@ -26,9 +26,7 @@
     UserNotificationCreate,
     UserNotificationPatch,
 )
-from simcore_service_webserver.users._notifications_handlers import (
-    _NotificationPathParams,
-)
+from simcore_service_webserver.users._notifications_rest import _NotificationPathParams
 from simcore_service_webserver.users._tokens_rest import _TokenPathParams
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["user"])

services/web/server/src/simcore_service_webserver/users/_notifications_handlers.py renamed to services/web/server/src/simcore_service_webserver/users/_notifications_rest.py

@@ -18,7 +18,7 @@
 from .._meta import API_VTAG
 from ..login.decorators import login_required
 from ..models import RequestContext
-from . import _preferences_api
+from . import _preferences_service
 from .exceptions import FrontendUserPreferenceIsNotDefinedError
 
 routes = web.RouteTableDef()
@@ -50,7 +50,7 @@ async def set_frontend_preference(request: web.Request) -> web.Response:
     req_body = await parse_request_body_as(PatchRequestBody, request)
     req_path_params = parse_request_path_parameters_as(PatchPathParams, request)
 
-    await _preferences_api.set_frontend_user_preference(
+    await _preferences_service.set_frontend_user_preference(
         request.app,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,

services/web/server/src/simcore_service_webserver/users/_preferences_db.py renamed to services/web/server/src/simcore_service_webserver/users/_preferences_repository.py

@@ -20,7 +20,7 @@
 )
 
 from ..db.plugin import get_database_engine
-from . import _preferences_db
+from . import _preferences_repository
 from ._preferences_models import (
     ALL_FRONTEND_PREFERENCES,
     TelemetryLowDiskSpaceWarningThresholdFrontendUserPreference,
@@ -39,7 +39,7 @@ async def _get_frontend_user_preferences(
 ) -> list[FrontendUserPreference]:
     saved_user_preferences: list[FrontendUserPreference | None] = await logged_gather(
         *(
-            _preferences_db.get_user_preference(
+            _preferences_repository.get_user_preference(
                 app,
                 user_id=user_id,
                 product_name=product_name,
@@ -64,7 +64,7 @@ async def get_frontend_user_preference(
     product_name: ProductName,
     preference_class: type[FrontendUserPreference],
 ) -> AnyUserPreference | None:
-    return await _preferences_db.get_user_preference(
+    return await _preferences_repository.get_user_preference(
         app,
         user_id=user_id,
         product_name=product_name,
@@ -127,7 +127,7 @@ async def set_frontend_user_preference(
         FrontendUserPreference.get_preference_class_from_name(preference_name),
     )
 
-    await _preferences_db.set_user_preference(
+    await _preferences_repository.set_user_preference(
         app,
         user_id=user_id,
         preference=TypeAdapter(preference_class).validate_python({"value": value}),  # type: ignore[arg-type] # GitHK this is suspicious

services/web/server/src/simcore_service_webserver/users/_preferences_handlers.py renamed to services/web/server/src/simcore_service_webserver/users/_preferences_rest.py

@@ -22,7 +22,7 @@
 
 from ..db.plugin import get_asyncpg_engine
 from ..security.api import clean_auth_policy_cache
-from . import _preferences_api, _users_repository
+from . import _preferences_service, _users_repository
 from ._common.models import (
     FullNameDict,
     ToUserUpdateDB,
@@ -314,8 +314,10 @@ async def get_user_profile(
     user_profile = await _users_repository.get_user_profile(app, user_id=user_id)
 
     try:
-        preferences = await _preferences_api.get_frontend_user_preferences_aggregation(
-            app, user_id=user_id, product_name=product_name
+        preferences = (
+            await _preferences_service.get_frontend_user_preferences_aggregation(
+                app, user_id=user_id, product_name=product_name
+            )
         )
     except GroupExtraPropertiesNotFoundError as err:
         raise MissingGroupExtraPropertiesForProductError(

services/web/server/src/simcore_service_webserver/users/_preferences_api.py renamed to services/web/server/src/simcore_service_webserver/users/_preferences_service.py

@@ -9,7 +9,7 @@
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 from servicelib.aiohttp.observer import setup_observer_registry
 
-from . import _notifications_handlers, _preferences_handlers, _tokens_rest, _users_rest
+from . import _notifications_rest, _preferences_rest, _tokens_rest, _users_rest
 from ._preferences_models import overwrite_user_preferences_defaults
 
 _logger = logging.getLogger(__name__)
@@ -29,5 +29,5 @@ def setup_users(app: web.Application):
 
     app.router.add_routes(_users_rest.routes)
     app.router.add_routes(_tokens_rest.routes)
-    app.router.add_routes(_notifications_handlers.routes)
-    app.router.add_routes(_preferences_handlers.routes)
+    app.router.add_routes(_notifications_rest.routes)
+    app.router.add_routes(_preferences_rest.routes)

services/web/server/src/simcore_service_webserver/users/_users_service.py

@@ -1,8 +1,11 @@
-from ._preferences_api import get_frontend_user_preference, set_frontend_user_preference
 from ._preferences_models import (
     PreferredWalletIdFrontendUserPreference,
     TwoFAFrontendUserPreference,
 )
+from ._preferences_service import (
+    get_frontend_user_preference,
+    set_frontend_user_preference,
+)
 from .exceptions import UserDefaultWalletNotFoundError
 
 __all__ = (

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

@@ -35,7 +35,7 @@
     MAX_BYTES_SIZE_EXTRAS,
     PreRegisteredUserGet,
 )
-from simcore_service_webserver.users._preferences_api import (
+from simcore_service_webserver.users._preferences_service import (
     get_frontend_user_preferences_aggregation,
 )
 

services/web/server/src/simcore_service_webserver/users/preferences_api.py

@@ -34,9 +34,7 @@
     UserNotificationCreate,
     get_notification_key,
 )
-from simcore_service_webserver.users._notifications_handlers import (
-    _get_user_notifications,
-)
+from simcore_service_webserver.users._notifications_rest import _get_user_notifications
 
 
 @pytest.fixture