product and get|create

Author: pcrespov

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

@@ -35,9 +35,7 @@ async def get_product_group_id(
     return None if group_id is None else _GroupID(group_id)
 
 
-async def execute_get_or_create_product_group(
-    conn: AsyncConnection, product_name: str
-) -> int:
+async def get_or_create_product_group(conn: AsyncConnection, product_name: str) -> int:
     #
     # NOTE: Separated so it can be used in asyncpg and aiopg environs while both
     #       coexist

packages/postgres-database/tests/products/test_utils_products.py

@@ -10,8 +10,8 @@
 from simcore_postgres_database.models.groups import GroupType, groups
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.utils_products import (
-    execute_get_or_create_product_group,
     get_default_product_name,
+    get_or_create_product_group,
     get_product_group_id,
 )
 from sqlalchemy.ext.asyncio import AsyncEngine
@@ -45,7 +45,7 @@ async def test_get_or_create_group_product(
             )
         ):
             # get or create
-            product_group_id = await execute_get_or_create_product_group(
+            product_group_id = await get_or_create_product_group(
                 conn, product_name=product_row.name
             )
 
@@ -67,7 +67,7 @@ async def test_get_or_create_group_product(
             # idempotent
             for _ in range(3):
                 assert (
-                    await execute_get_or_create_product_group(
+                    await get_or_create_product_group(
                         conn, product_name=product_row.name
                     )
                     == product_group_id

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

@@ -20,7 +20,7 @@
 from models_library.users import UserID
 from simcore_postgres_database.errors import UniqueViolation
 from simcore_postgres_database.models.users import users
-from simcore_postgres_database.utils_products import execute_get_or_create_product_group
+from simcore_postgres_database.utils_products import get_or_create_product_group
 from simcore_postgres_database.utils_repos import (
     pass_or_acquire_connection,
     transaction_context,
@@ -173,7 +173,6 @@ async def get_all_user_groups_with_read_access(
     *,
     user_id: UserID,
 ) -> GroupsByTypeTuple:
-
     """
     Returns the user primary group, standard groups and the all group
     """
@@ -758,7 +757,7 @@ async def auto_add_user_to_product_group(
     product_name: str,
 ) -> GroupID:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
-        product_group_id: GroupID = await execute_get_or_create_product_group(
+        product_group_id: GroupID = await get_or_create_product_group(
             conn, product_name
         )
 

services/web/server/src/simcore_service_webserver/products/_repository.py

@@ -9,8 +9,8 @@
 from simcore_postgres_database.models.jinja2_templates import jinja2_templates
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.utils_products import (
-    execute_get_or_create_product_group,
     get_default_product_name,
+    get_or_create_product_group,
 )
 from simcore_postgres_database.utils_products_prices import (
     ProductPriceInfo,
@@ -101,13 +101,10 @@ async def list_products(
 
                 payments = await _get_product_payment_fields(conn, product_name=name)
 
-                app_products.append(
-                    Product(
-                        **dict(row.items()),
-                        is_payment_enabled=payments.enabled,
-                        credits_per_usd=payments.credits_per_usd,
-                    )
-                )
+                product = Product.model_validate(row, from_attributes=True)
+                product.is_payment_enabled = payments.enabled
+                product.credits_per_usd = payments.credits_per_usd
+                app_products.append(product)
 
                 assert name in FRONTEND_APPS_AVAILABLE  # nosec
 
@@ -219,7 +216,7 @@ async def auto_create_products_groups(
         for product_name in product_names:
             # NOTE: transaction is per product. fail-fast!
             async with transaction_context(self.engine, connection) as conn:
-                product_group_id: GroupID = await execute_get_or_create_product_group(
+                product_group_id: GroupID = await get_or_create_product_group(
                     conn, product_name
                 )
                 product_groups_map[product_name] = product_group_id

services/web/server/tests/unit/with_dbs/conftest.py

@@ -64,8 +64,8 @@
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.products_prices import products_prices
 from simcore_postgres_database.utils_products import (
-    execute_get_or_create_product_group,
     get_default_product_name,
+    get_or_create_product_group,
 )
 from simcore_service_webserver.application import create_application
 from simcore_service_webserver.application_settings_utils import AppConfigDict
@@ -745,7 +745,7 @@ async def all_products_names(
                         )
                     )
                 )
-                await execute_get_or_create_product_group(conn, product_name=name)
+                await get_or_create_product_group(conn, product_name=name)
             priority += 1
 
     async with asyncpg_engine.connect() as conn: