fixes

Author: pcrespov

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

@@ -22,6 +22,7 @@
     transaction_context,
 )
 from simcore_service_webserver.constants import FRONTEND_APPS_AVAILABLE
+from sqlalchemy.engine import Row
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from ..constants import FRONTEND_APPS_AVAILABLE
@@ -80,6 +81,14 @@ async def _get_product_payment_fields(
     )
 
 
+def _to_domain(row: Row, payments: PaymentFieldsTuple) -> Product:
+    return Product(
+        **row._asdict(),
+        is_payment_enabled=payments.enabled,
+        credits_per_usd=payments.credits_per_usd,
+    )
+
+
 class ProductRepository(BaseRepositoryV2):
 
     async def list_products(
@@ -98,13 +107,8 @@ async def list_products(
             rows = await conn.stream(query)
             async for row in rows:
                 name = row.name
-
                 payments = await _get_product_payment_fields(conn, product_name=name)
-
-                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)
+                app_products.append(_to_domain(row, payments))
 
                 assert name in FRONTEND_APPS_AVAILABLE  # nosec
 
@@ -132,11 +136,7 @@ async def get_product(
                 payments = await _get_product_payment_fields(
                     conn, product_name=row.name
                 )
-                return Product(
-                    **row._asdict(),
-                    is_payment_enabled=payments.enabled,
-                    credits_per_usd=payments.credits_per_usd,
-                )
+                return _to_domain(row, payments)
             return None
 
     async def get_default_product_name(

services/web/server/tests/unit/with_dbs/04/products/test_products_repository.py

@@ -8,7 +8,6 @@
 from decimal import Decimal
 from typing import Any
 
-import aiopg.sa
 import pytest
 import sqlalchemy as sa
 from aiohttp import web
@@ -36,6 +35,7 @@
 from simcore_service_webserver.products._web_middlewares import (
     _get_default_product_name,
 )
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 
 @pytest.fixture(scope="module")
@@ -186,10 +186,10 @@ async def product_repository(app: web.Application) -> ProductRepository:
 async def test_utils_products_and_webserver_default_product_in_sync(
     app: web.Application,
     product_repository: ProductRepository,
-    aiopg_engine: aiopg.sa.engine.Engine,
+    asyncpg_engine: AsyncEngine,
 ):
     # tests definitions of default from utle_products and web-server.products are in sync
-    async with aiopg_engine.acquire() as conn:
+    async with asyncpg_engine.connect() as conn:
         default_product_name = await utils_products.get_default_product_name(conn)
         assert default_product_name == _get_default_product_name(app)