new column

Author: pcrespov

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

@@ -1,15 +1,16 @@
-""" User's confirmations table
+"""User's confirmations table
 
-    - Keeps a list of tokens to identify an action (registration, invitation, reset, etc) authorized
-    by link to a a user in the framework
-    - These tokens have an expiration date defined by configuration
+- Keeps a list of tokens to identify an action (registration, invitation, reset, etc) authorized
+by link to a a user in the framework
+- These tokens have an expiration date defined by configuration
 
 """
+
 import enum
 
 import sqlalchemy as sa
 
-from ._common import RefActions
+from ._common import RefActions, column_created_datetime
 from .base import metadata
 from .users import users
 
@@ -47,12 +48,8 @@ class ConfirmationAction(enum.Enum):
         sa.Text,
         doc="Extra data associated to the action. SEE handlers_confirmation.py::email_confirmation",
     ),
-    sa.Column(
-        "created_at",
-        sa.DateTime(),
-        nullable=False,
-        # NOTE: that here it would be convenient to have a server_default=now()!
-        doc="Creation date of this code."
+    column_created_datetime(
+        doc="Creation date of this code. "
         "Can be used as reference to determine the expiration date. SEE ${ACTION}_CONFIRMATION_LIFETIME",
     ),
     # constraints ----------------

services/web/server/src/simcore_service_webserver/login/_confirmation_repository.py

@@ -1,5 +1,4 @@
 import logging
-from datetime import datetime
 from typing import Any
 
 import sqlalchemy as sa
@@ -21,7 +20,15 @@
 
 
 def _to_domain(confirmation_row: Row) -> Confirmation:
-    return Confirmation.model_validate(confirmation_row)
+    return Confirmation.model_validate(
+        {
+            "code": confirmation_row.code,
+            "user_id": confirmation_row.user_id,
+            "action": confirmation_row.action.value,  # conversion to literal string
+            "data": confirmation_row.data,
+            "created_at": confirmation_row.created,  # renames
+        }
+    )
 
 
 class ConfirmationRepository(BaseRepository):
@@ -57,7 +64,6 @@ async def create_confirmation(
                     user_id=user_id,
                     action=action,
                     data=data,
-                    created_at=datetime.utcnow(),
                 )
                 .returning(*confirmations.c)
             )

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

@@ -17,6 +17,7 @@
 from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from simcore_postgres_database.models.users import users
 from simcore_postgres_database.models.wallets import wallets
+from simcore_service_webserver.db.plugin import get_asyncpg_engine
 from simcore_service_webserver.login._confirmation_repository import (
     ConfirmationRepository,
 )
@@ -88,7 +89,7 @@ def confirmation_repository(client: TestClient) -> ConfirmationRepository:
     """Modern confirmation repository instance"""
     assert client.app
     # Get the async engine from the application
-    engine = client.app["postgres_db_engine"]
+    engine = get_asyncpg_engine(client.app)
     return ConfirmationRepository(engine)