feat: enhance pre-registration details with product name and foreign key support

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/models/users_details.py

@@ -4,11 +4,13 @@
 
 from ._common import (
     RefActions,
+    column_created_by_user,
     column_created_datetime,
     column_modified_datetime,
     register_modified_datetime_auto_update_trigger,
 )
 from .base import metadata
+from .products import products  # Import the products table
 from .users import users
 
 users_pre_registration_details = sa.Table(
@@ -19,6 +21,13 @@
     # a row can be added in this table during pre-registration i.e. even before the `users` row exists.
     #
     metadata,
+    sa.Column(
+        "id",
+        sa.BigInteger,
+        sa.Identity(start=1, cycle=False),
+        primary_key=True,
+        doc="Primary key for the pre-registration entry",
+    ),
     sa.Column(
         "user_id",
         sa.Integer,
@@ -35,7 +44,7 @@
         "pre_email",
         sa.String(),
         nullable=False,
-        unique=True,
+        unique=False,  # Same email could be used for different products
         doc="Email of the user on pre-registration (copied to users.email upon registration)",
     ),
     sa.Column(
@@ -61,6 +70,19 @@
         nullable=False,
         server_default=sa.text("'PENDING'::account_request_status"),
     ),
+    # Product the user is requesting access to
+    sa.Column(
+        "product_name",
+        sa.String,
+        sa.ForeignKey(
+            products.c.name,
+            onupdate=RefActions.CASCADE,
+            ondelete=RefActions.SET_NULL,
+            name="fk_users_pre_registration_details_product_name",
+        ),
+        nullable=True,
+        doc="Product that the user is requesting an account for",
+    ),
     # Billable address columns:
     sa.Column("institution", sa.String(), doc="the name of a company or university"),
     sa.Column("address", sa.String()),
@@ -75,17 +97,7 @@
         doc="Extra information provided in the form but still not defined as a column.",
     ),
     # Other related users
-    sa.Column(
-        "created_by",
-        sa.Integer,
-        sa.ForeignKey(
-            users.c.id,
-            onupdate=RefActions.CASCADE,
-            ondelete=RefActions.SET_NULL,
-        ),
-        nullable=True,
-        doc="PO user that issued this pre-registration",
-    ),
+    column_created_by_user(users_table=users, required=False),
     column_created_datetime(timezone=False),
     column_modified_datetime(timezone=False),
 )

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -85,8 +85,10 @@ def random_user(
 def random_pre_registration_details(
     fake: Faker = DEFAULT_FAKER,
     *,
+    # foreign keys
     user_id: int | None = None,
     created_by: int | None = None,
+    product_name: str | None = None,
     **overrides,
 ):
     from simcore_postgres_database.models.users_details import (
@@ -117,6 +119,7 @@ def random_pre_registration_details(
             "eula": True,
             "ipinfo": {"x-real-ip": "127.0.0.1"},
         },
+        "product_name": product_name,
         "created_by": created_by,  # user id
     }