fix tests

Author: pcrespov

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

@@ -43,9 +43,9 @@ async def get_product_latest_price_info_or_none(
     return None
 
 
-async def get_product_latest_stripe_info(
+async def get_product_latest_stripe_info_or_none(
     conn: AsyncConnection, product_name: str
-) -> tuple[StripePriceID, StripeTaxRateID]:
+) -> tuple[StripePriceID, StripeTaxRateID] | None:
     # Stripe info of a product for latest price
     result = await conn.execute(
         sa.select(
@@ -58,10 +58,7 @@ async def get_product_latest_stripe_info(
     )
 
     row = result.one_or_none()
-    if row is None:
-        msg = f"Required Stripe information missing from product {product_name=}"
-        raise ValueError(msg)
-    return (row.stripe_price_id, row.stripe_tax_rate_id)
+    return (row.stripe_price_id, row.stripe_tax_rate_id) if row else None
 
 
 async def is_payment_enabled(conn: AsyncConnection, product_name: str) -> bool:

packages/postgres-database/tests/test_models_products_prices.py

@@ -15,7 +15,7 @@
 from simcore_postgres_database.models.products_prices import products_prices
 from simcore_postgres_database.utils_products_prices import (
     get_product_latest_price_info_or_none,
-    get_product_latest_stripe_info,
+    get_product_latest_stripe_info_or_none,
     is_payment_enabled,
 )
 from sqlalchemy.engine.row import Row
@@ -257,12 +257,15 @@ async def test_get_product_latest_stripe_info(
         )
 
     # undefined product
-    with pytest.raises(ValueError, match="undefined"):
-        await get_product_latest_stripe_info(connection, product_name="undefined")
+    undefined_product_stripe_info = await get_product_latest_stripe_info_or_none(
+        connection, product_name="undefined"
+    )
+    assert undefined_product_stripe_info is None
 
     # defined product
-    product_stripe_info = await get_product_latest_stripe_info(
+    product_stripe_info = await get_product_latest_stripe_info_or_none(
         connection, product_name=fake_product.name
     )
+    assert product_stripe_info
     assert product_stripe_info[0] == stripe_price_id_value
     assert product_stripe_info[1] == stripe_tax_rate_id_value

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

@@ -15,13 +15,14 @@
 from simcore_postgres_database.utils_products_prices import (
     ProductPriceInfo,
     get_product_latest_price_info_or_none,
-    get_product_latest_stripe_info,
+    get_product_latest_stripe_info_or_none,
 )
 from simcore_postgres_database.utils_repos import (
     pass_or_acquire_connection,
     transaction_context,
 )
 from simcore_service_webserver.constants import FRONTEND_APPS_AVAILABLE
+from simcore_service_webserver.products.errors import MissingStripeConfigError
 from sqlalchemy.engine import Row
 from sqlalchemy.ext.asyncio import AsyncConnection
 
@@ -160,9 +161,15 @@ async def get_product_stripe_info(
         self, product_name: str, connection: AsyncConnection | None = None
     ) -> ProductStripeInfoGet:
         async with pass_or_acquire_connection(self.engine, connection) as conn:
-            stripe_price_id, stripe_tax_rate_id = await get_product_latest_stripe_info(
+            latest_stripe_info = await get_product_latest_stripe_info_or_none(
                 conn, product_name=product_name
             )
+            if latest_stripe_info is None:
+                exc = MissingStripeConfigError(product_name=product_name)
+                exc.add_note("Stripe config missing in database")
+                raise exc
+
+            stripe_price_id, stripe_tax_rate_id = latest_stripe_info
             return ProductStripeInfoGet(
                 stripe_price_id=stripe_price_id, stripe_tax_rate_id=stripe_tax_rate_id
             )

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

@@ -111,15 +111,18 @@ async def get_product_stripe_info(
     app: web.Application, *, product_name: ProductName
 ) -> ProductStripeInfoGet:
     repo = ProductRepository.create_from_app(app)
+
     product_stripe_info = await repo.get_product_stripe_info(product_name)
     if (
-        not product_stripe_info
-        or "missing!!" in product_stripe_info.stripe_price_id
+        "missing!!" in product_stripe_info.stripe_price_id
         or "missing!!" in product_stripe_info.stripe_tax_rate_id
     ):
-        raise MissingStripeConfigError(
-            product_name=product_name, product_stripe_info=product_stripe_info
+        exc = MissingStripeConfigError(
+            product_name=product_name,
+            product_stripe_info=product_stripe_info,
         )
+        exc.add_note("Probably stripe side is not configured")
+        raise exc
     return product_stripe_info
 
 

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

@@ -4,6 +4,10 @@
 from aiohttp import web
 from models_library.products import ProductName
 from simcore_postgres_database.utils_products_prices import ProductPriceInfo
+from simcore_service_webserver.products.errors import (
+    FileTemplateNotFoundError,
+    ProductNotFoundError,
+)
 
 from .._resources import webserver_resources
 from ..constants import RQ_PRODUCT_KEY
@@ -27,6 +31,14 @@ def get_current_product(request: web.Request) -> Product:
     return current_product
 
 
+def _get_current_product_or_none(request: web.Request) -> Product | None:
+    try:
+        product: Product = get_current_product(request)
+        return product
+    except ProductNotFoundError:
+        return None
+
+
 async def get_current_product_credit_price_info(
     request: web.Request,
 ) -> ProductPriceInfo | None:
@@ -48,19 +60,10 @@ def _themed(dirname: str, template: str) -> Path:
     return path
 
 
-def _get_current_product_or_none(request: web.Request) -> Product | None:
-    try:
-        product: Product = get_current_product(request)
-        return product
-    except KeyError:
-        return None
-
-
 async def _get_common_template_path(filename: str) -> Path:
     common_template = _themed("templates/common", filename)
     if not common_template.exists():
-        msg = f"{filename} is not part of the templates/common"
-        raise ValueError(msg)
+        raise FileTemplateNotFoundError(filename=filename)
     return common_template
 
 

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

@@ -21,4 +21,11 @@ class ProductTemplateNotFoundError(ProductError):
 
 
 class MissingStripeConfigError(ProductError):
-    msg_template = "Missing product stripe for product {product_name}"
+    msg_template = (
+        "Missing product stripe for product {product_name}.\n"
+        "NOTE: This is currently setup manually by the operator in pg database via adminer and also in the stripe platform."
+    )
+
+
+class FileTemplateNotFoundError(ProductError):
+    msg_template = "{filename} is not part of the templates/common"

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

@@ -35,6 +35,7 @@
 from simcore_service_webserver.products._web_middlewares import (
     _get_default_product_name,
 )
+from simcore_service_webserver.products.errors import MissingStripeConfigError
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
@@ -236,7 +237,7 @@ async def test_product_repository_get_product_stripe_info(
     assert isinstance(stripe_info, ProductStripeInfoGet)
 
     product_name = "s4l"
-    with pytest.raises(ValueError, match=product_name):
+    with pytest.raises(MissingStripeConfigError, match=product_name):
         stripe_info = await product_repository.get_product_stripe_info(product_name)