utils mixin

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/utils_groups_extra_properties.py

@@ -35,10 +35,10 @@ class GroupExtraProperties(FromRowMixin):
     enable_efs: bool
 
 
-async def _list_table_entries_ordered_by_group_type(
-    connection: SAConnection, user_id: int, product_name: str
-) -> list[RowProxy]:
-    list_stmt = (
+async def _list_table_entries_ordered_by_group_type_query(
+    user_id: int, product_name: str
+):
+    return (
         sa.select(
             groups_extra_properties,
             groups.c.type,
@@ -68,6 +68,14 @@ async def _list_table_entries_ordered_by_group_type(
         .alias()
     )
 
+
+async def _list_table_entries_ordered_by_group_type(
+    connection: SAConnection, user_id: int, product_name: str
+) -> list[RowProxy]:
+    list_stmt = _list_table_entries_ordered_by_group_type_query(
+        user_id=user_id, product_name=product_name
+    )
+
     result = await connection.execute(
         sa.select(list_stmt).order_by(list_stmt.c.type_order)
     )
@@ -106,7 +114,7 @@ async def get(
         result = await connection.execute(get_stmt)
         assert result  # nosec
         if row := await result.first():
-            return GroupExtraProperties.from_row(row)
+            return GroupExtraProperties.from_row_proxy(row)
         msg = f"Properties for group {gid} not found"
         raise GroupExtraPropertiesNotFoundError(msg)
 
@@ -122,7 +130,7 @@ async def get_aggregated_properties_for_user(
         )
         merged_standard_extra_properties = None
         for row in rows:
-            group_extra_properties = GroupExtraProperties.from_row(row)
+            group_extra_properties = GroupExtraProperties.from_row_proxy(row)
             match row.type:
                 case GroupType.PRIMARY:
                     # this always has highest priority

packages/postgres-database/src/simcore_postgres_database/utils_models.py

@@ -2,6 +2,7 @@
 from typing import TypeVar
 
 from aiopg.sa.result import RowProxy
+from sqlalchemy.engine.row import Row
 
 ModelType = TypeVar("ModelType")
 
@@ -10,7 +11,13 @@ class FromRowMixin:
     """Mixin to allow instance construction from aiopg.sa.result.RowProxy"""
 
     @classmethod
-    def from_row(cls: type[ModelType], row: RowProxy) -> ModelType:
+    def from_row_proxy(cls: type[ModelType], row: RowProxy) -> ModelType:
         assert is_dataclass(cls)  # nosec
         field_names = [f.name for f in fields(cls)]
         return cls(**{k: v for k, v in row.items() if k in field_names})  # type: ignore[return-value]
+
+    @classmethod
+    def from_row(cls: type[ModelType], row: Row) -> ModelType:
+        assert is_dataclass(cls)  # nosec
+        field_names = [f.name for f in fields(cls)]
+        return cls(**{k: v for k, v in row._asdict().items() if k in field_names})  # type: ignore[return-value]

packages/postgres-database/tests/test_utils_groups_extra_properties.py

@@ -64,7 +64,7 @@ async def _creator(
         assert result
         row = await result.first()
         assert row
-        properties = GroupExtraProperties.from_row(row)
+        properties = GroupExtraProperties.from_row_proxy(row)
         created_properties.append((properties.group_id, properties.product_name))
         return properties
 

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

@@ -2,8 +2,7 @@
 
 import sqlalchemy as sa
 from aiohttp import web
-from models_library.api_schemas_webserver.users import UserPermission
-from models_library.users import GroupID, UserBillingDetails, UserID
+from models_library.users import GroupID, UserBillingDetails, UserID, UserPermission
 from simcore_postgres_database.models.groups import groups, user_to_groups
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.users import UserStatus, users

services/web/server/tests/unit/isolated/test_garbage_collector_core.py

@@ -240,7 +240,9 @@ async def test_remove_orphaned_services_inexisting_user_does_not_save_state(
         mock.ANY, fake_running_service.node_uuid
     )
     mock_list_node_ids_in_project.assert_called_once_with(mock.ANY, project_id)
-    mock_get_user_role.assert_called_once_with(mock_app, fake_running_service.user_id)
+    mock_get_user_role.assert_called_once_with(
+        mock_app, user_id=fake_running_service.user_id
+    )
     mock_has_write_permission.assert_not_called()
     mock_stop_dynamic_service.assert_called_once_with(
         mock_app,