fix duplicate user

api.saladeaula.digital/app/routes/enrollments/enroll.py

@@ -220,15 +220,25 @@ def enroll_now(enrollment: Enrollment, context: Context):
                 exc_cls=OrderNotFoundError,
                 table_name=ORDER_TABLE,
             )
-            transact.put(
-                item={
-                    'id': seat.order_id,
-                    'sk': f'ENROLLMENT#{enrollment.id}',
-                    'course': course.model_dump(),
-                    'user': user.model_dump(),
-                    'status': 'EXECUTED',
-                    'executed_at': now_,
-                    'created_at': now_,
+            transact.update(
+                key=KeyPair(
+                    pk=str(seat.order_id),
+                    sk=f'ENROLLMENT#{enrollment.id}',
+                ),
+                update_expr='SET course = :course, \
+                                 #user = :user, \
+                                 #status = :executed, \
+                                 executed_at = :now, \
+                                 created_at = if_not_exists(created_at, :now)',
+                expr_attr_names={
+                    '#user': 'user',
+                    '#status': 'status',
+                },
+                expr_attr_values={
+                    ':course': course.model_dump(),
+                    ':user': user.model_dump(),
+                    ':executed': 'EXECUTED',
+                    ':now': now_,
                 },
                 table_name=ORDER_TABLE,
             )
@@ -240,6 +250,15 @@ def enroll_now(enrollment: Enrollment, context: Context):
                 cond_expr='attribute_exists(sk)',
                 exc_cls=SeatNotFoundError,
             )
+            # Enrollment should know where it comes from
+            transact.put(
+                item={
+                    'id': enrollment.id,
+                    'sk': f'LINKED_ENTITY#PARENT#ORDER#{seat.order_id}',
+                    'created_at': now_,
+                },
+                cond_expr='attribute_not_exists(sk)',
+            )
 
         transact.put(
             item={

api.saladeaula.digital/app/routes/orgs/enrollments/scheduled.py

@@ -5,14 +5,23 @@ from aws_lambda_powertools import Logger
 from aws_lambda_powertools.event_handler.api_gateway import Router
 from aws_lambda_powertools.event_handler.exceptions import NotFoundError
 from aws_lambda_powertools.event_handler.openapi.params import Body, Query
+from layercake.dateutils import now
 from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, PartitionKey
 from pydantic import FutureDatetime
 
 from api_gateway import JSONResponse
 from boto3clients import dynamodb_client
 from config import ENROLLMENT_TABLE
+from middlewares.authentication_middleware import User as Authenticated
 
-from ...enrollments.enroll import Context, Enrollment, Org, Subscription, enroll_now
+from ...enrollments.enroll import (
+    Context,
+    Enrollment,
+    Org,
+    Seat,
+    Subscription,
+    enroll_now,
+)
 
 logger = Logger(__name__)
 router = Router()
@@ -65,6 +74,7 @@ def proceed(
     scheduled_for: Annotated[FutureDatetime, Body(embed=True)],
     lock_hash: Annotated[str, Body(embed=True)],
 ):
+    now_ = now()
     pk = f'SCHEDULED#ORG#{org_id}'
     sk = f'{scheduled_for.isoformat()}#{lock_hash}'
 
@@ -72,10 +82,13 @@ def proceed(
         KeyPair(pk, sk),
         exc_cls=ScheduledNotFoundError,
     )
-    billing_day = scheduled.get('subscription_billing_day')
+    org = Org(id=org_id, name=scheduled['org_name'])
+    created_by: Authenticated = router.context['user']
+    seat: Seat | None = scheduled.get('seat')
+    billing_day: int | None = scheduled.get('subscription_billing_day')
     ctx: Context = {
-        'created_by': router.context['user'],
-        'org': Org(id=org_id, name=scheduled['org_name']),
+        'created_by': created_by,
+        'org': org,
     }
 
     if billing_day:
@@ -86,12 +99,26 @@ def proceed(
             Enrollment(
                 user=scheduled['user'],
                 course=scheduled['course'],
-                seat=scheduled.get('seat'),
+                seat=seat,
             ),
             ctx,
         )
 
         with dyn.transact_writer() as transact:
+            transact.put(
+                item={
+                    'id': pk,
+                    'sk': f'{sk}#EXECUTED',
+                    'enrollment_id': enrollment.id,
+                    'user': scheduled['user'],
+                    'course': scheduled['course'],
+                    'created_by': {
+                        'id': created_by.id,
+                        'name': created_by.name,
+                    },
+                    'created_at': now_,
+                }
+            )
             transact.delete(key=KeyPair(pk, sk))
             transact.delete(key=KeyPair('LOCK#SCHEDULED', lock_hash))
     except Exception: