ongoing and crying

Author: sanderegg

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

@@ -6,10 +6,10 @@
 from typing import Any
 
 import sqlalchemy as sa
-from aiopg.sa.connection import SAConnection
-from aiopg.sa.result import RowProxy
+from common_library.async_tools import maybe_await
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
+from ._protocols import DBConnection
 from .models.groups import GroupType, groups, user_to_groups
 from .models.groups_extra_properties import groups_extra_properties
 from .utils_models import FromRowMixin
@@ -98,24 +98,6 @@ def _get_stmt(gid: int, product_name: str):
             & (groups_extra_properties.c.product_name == product_name)
         )
 
-    @staticmethod
-    async def get(
-        connection: SAConnection, *, gid: int, product_name: str
-    ) -> GroupExtraProperties:
-        warnings.warn(
-            _WARNING_FMSG.format("get", "get_v2"),
-            DeprecationWarning,
-            stacklevel=1,
-        )
-
-        query = GroupExtraPropertiesRepo._get_stmt(gid, product_name)
-        result = await connection.execute(query)
-        assert result  # nosec
-        if row := await result.first():
-            return GroupExtraProperties.from_row_proxy(row)
-        msg = f"Properties for group {gid} not found"
-        raise GroupExtraPropertiesNotFoundError(msg)
-
     @staticmethod
     async def get_v2(
         engine: AsyncEngine,
@@ -173,7 +155,7 @@ def _aggregate(
 
     @staticmethod
     async def get_aggregated_properties_for_user(
-        connection: SAConnection,
+        connection: DBConnection,
         *,
         user_id: int,
         product_name: str,
@@ -196,8 +178,8 @@ async def get_aggregated_properties_for_user(
         )
         assert result  # nosec
 
-        rows: list[RowProxy] | None = await result.fetchall()
-        assert rows is not None  # nosec
+        rows = await maybe_await(result.fetchall())
+        assert isinstance(rows, list)  # nosec
 
         return GroupExtraPropertiesRepo._aggregate(
             rows, user_id, product_name, GroupExtraProperties.from_row_proxy

packages/postgres-database/tests/test_utils_groups_extra_properties.py

@@ -22,15 +22,18 @@
 )
 from sqlalchemy import literal_column
 from sqlalchemy.engine.row import Row
-from sqlalchemy.ext.asyncio import AsyncEngine
+from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 
 async def test_get_raises_if_not_found(
-    faker: Faker, connection: aiopg.sa.connection.SAConnection
+    asyncpg_engine: AsyncEngine,
+    faker: Faker,
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
-        await GroupExtraPropertiesRepo.get(
-            connection, gid=faker.pyint(min_value=1), product_name=faker.pystr()
+        await GroupExtraPropertiesRepo.get_v2(
+            asyncpg_engine,
+            gid=faker.pyint(min_value=1),
+            product_name=faker.pystr(),
         )
 
 
@@ -81,28 +84,6 @@ async def _creator(
         )
 
 
-async def test_get(
-    connection: aiopg.sa.connection.SAConnection,
-    registered_user: RowProxy,
-    product_name: str,
-    create_fake_product: Callable[[str], Awaitable[Row]],
-    create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
-):
-    with pytest.raises(GroupExtraPropertiesNotFoundError):
-        await GroupExtraPropertiesRepo.get(
-            connection, gid=registered_user.primary_gid, product_name=product_name
-        )
-
-    await create_fake_product(product_name)
-    created_extra_properties = await create_fake_group_extra_properties(
-        registered_user.primary_gid, product_name
-    )
-    received_extra_properties = await GroupExtraPropertiesRepo.get(
-        connection, gid=registered_user.primary_gid, product_name=product_name
-    )
-    assert created_extra_properties == received_extra_properties
-
-
 async def test_get_v2(
     asyncpg_engine: AsyncEngine,
     registered_user: RowProxy,
@@ -135,27 +116,30 @@ async def everyone_group_id(connection: aiopg.sa.connection.SAConnection) -> int
 
 
 async def test_get_aggregated_properties_for_user_with_no_entries_raises(
-    connection: aiopg.sa.connection.SAConnection,
+    connection_factory: aiopg.sa.connection.SAConnection | AsyncConnection,
     product_name: str,
     registered_user: RowProxy,
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
 
 
 async def _add_user_to_group(
-    connection: aiopg.sa.connection.SAConnection, *, user_id: int, group_id: int
+    connection: aiopg.sa.connection.SAConnection | AsyncConnection,
+    *,
+    user_id: int,
+    group_id: int,
 ) -> None:
-    result = await connection.execute(
+    await connection.execute(
         sqlalchemy.insert(user_to_groups).values(uid=user_id, gid=group_id)
     )
-    assert result.rowcount == 1
 
 
 async def test_get_aggregated_properties_for_user_returns_properties_in_expected_priority(
     connection: aiopg.sa.connection.SAConnection,
+    connection_factory: aiopg.sa.connection.SAConnection | AsyncConnection,
     product_name: str,
     registered_user: RowProxy,
     create_fake_product: Callable[[str], Awaitable[Row]],
@@ -177,21 +161,21 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     # this should return the everyone group properties
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties == everyone_group_extra_properties
 
     # let's add the user in these groups
     for group in created_groups:
         await _add_user_to_group(
-            connection, user_id=registered_user.id, group_id=group.gid
+            connection_factory, user_id=registered_user.id, group_id=group.gid
         )
 
     # this changes nothing
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties == everyone_group_extra_properties
@@ -205,7 +189,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     # this returns the last properties created
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties != everyone_group_extra_properties
@@ -218,14 +202,15 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     # this now returns the primary properties
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties == personal_group_extra_properties
 
 
 async def test_get_aggregated_properties_for_user_returns_properties_in_expected_priority_without_everyone_group(
     connection: aiopg.sa.connection.SAConnection,
+    connection_factory: aiopg.sa.connection.SAConnection | AsyncConnection,
     product_name: str,
     registered_user: RowProxy,
     create_fake_product: Callable[[str], Awaitable[Row]],
@@ -241,7 +226,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     # let's add the user in these groups
     for group in created_groups:
         await _add_user_to_group(
-            connection, user_id=registered_user.id, group_id=group.gid
+            connection_factory, user_id=registered_user.id, group_id=group.gid
         )
 
     # now create some extra properties
@@ -253,7 +238,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     # this returns the last properties created
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties == standard_group_extra_properties[0]
@@ -265,14 +250,15 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     # this now returns the primary properties
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties == personal_group_extra_properties
 
 
 async def test_get_aggregated_properties_for_user_returns_property_values_as_truthy_if_one_of_them_is(
     connection: aiopg.sa.connection.SAConnection,
+    connection_factory: aiopg.sa.connection.SAConnection | AsyncConnection,
     product_name: str,
     registered_user: RowProxy,
     create_fake_product: Callable[[str], Awaitable[Row]],
@@ -294,7 +280,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     # this should return the everyone group properties
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties == everyone_group_extra_properties
@@ -310,13 +296,13 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
             use_on_demand_clusters=False,
         )
         await _add_user_to_group(
-            connection, user_id=registered_user.id, group_id=group.gid
+            connection_factory, user_id=registered_user.id, group_id=group.gid
         )
 
     # now we still should not have any of these value Truthy
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties.internet_access is False
@@ -335,7 +321,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     # now we should have internet access
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties.internet_access is True
@@ -354,7 +340,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     # now we should have internet access and service override
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties.internet_access is True
@@ -373,7 +359,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
 
     aggregated_group_properties = (
         await GroupExtraPropertiesRepo.get_aggregated_properties_for_user(
-            connection, user_id=registered_user.id, product_name=product_name
+            connection_factory, user_id=registered_user.id, product_name=product_name
         )
     )
     assert aggregated_group_properties.internet_access is False
@@ -384,6 +370,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
 async def test_get_aggregated_properties_for_user_returns_property_values_as_truthy_if_one_of_them_is_v2(
     asyncpg_engine: AsyncEngine,
     connection: aiopg.sa.connection.SAConnection,
+    connection_factory: aiopg.sa.connection.SAConnection | AsyncConnection,
     product_name: str,
     registered_user: RowProxy,
     create_fake_product: Callable[[str], Awaitable[Row]],
@@ -421,7 +408,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
             use_on_demand_clusters=False,
         )
         await _add_user_to_group(
-            connection, user_id=registered_user.id, group_id=group.gid
+            connection_factory, user_id=registered_user.id, group_id=group.gid
         )
 
     # now we still should not have any of these value Truthy