fixes tests

Author: pcrespov

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

@@ -324,6 +324,11 @@ async def get_billing_details(
         product_name: str,
         user_id: int,
     ) -> Any | None:
+        """Returns billing details for the specified user and product.
+
+        - If the user is registered without a product, returns details for that registration.
+        - Returns None if no billing details are found.
+        """
         async with pass_or_acquire_connection(self._engine, connection) as conn:
             result = await conn.execute(
                 sa.select(
@@ -345,7 +350,10 @@ async def get_billing_details(
                 )
                 .where(
                     (users.c.id == user_id)
-                    & (users_pre_registration_details.c.product_name == product_name)
+                    & (
+                        (users_pre_registration_details.c.product_name == product_name)
+                        | (users_pre_registration_details.c.product_name.is_(None))
+                    )
                 )
                 .order_by(users_pre_registration_details.c.created.desc())
                 .limit(1)

packages/postgres-database/tests/test_users_details.py

@@ -288,6 +288,7 @@ async def test_create_and_link_user_from_pre_registration(
 async def test_get_billing_details_from_pre_registration(
     asyncpg_engine: AsyncEngine,
     pre_registered_user: tuple[str, dict[str, Any]],
+    product: dict[str, Any],
 ):
     """Test that billing details can be retrieved from pre-registration data."""
     pre_email, fake_pre_registration_data = pre_registered_user
@@ -309,7 +310,9 @@ async def test_get_billing_details_from_pre_registration(
         )
 
     # Get billing details
-    invoice_data = await repo.get_billing_details(user_id=new_user.id)
+    invoice_data = await repo.get_billing_details(
+        user_id=new_user.id, product_name=product["name"]
+    )
     assert invoice_data is not None
 
     # Test UserAddress model conversion

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

@@ -373,6 +373,7 @@ async def get_user_billing_details(
     product_name: ProductName,
 ) -> UserBillingDetails:
     """
+    Returns UserBillingDetails for the given user when registered in a product or None
     Raises:
         BillingDetailsNotFoundError
     """

services/web/server/tests/unit/with_dbs/04/wallets/payments/conftest.py

@@ -342,6 +342,8 @@ def setup_user_pre_registration_details_db(
                 country=faker.random_element([c.name for c in pycountry.countries]),
                 postal_code=faker.postcode(),
                 created_by=None,
+                # NOTE: here product is not specified (i.e. product_name=None) on purspose to check
+                # backwards compatibility
             )
             .returning(sa.literal_column("*"))
         )