add enroll to subscribed

enrollments-events/app/events/enroll.py

@@ -1,5 +1,3 @@
-from uuid import uuid4
-
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.utilities.data_classes import (
     EventBridgeEvent,
@@ -19,11 +17,13 @@ from layercake.dynamodb import (
 from boto3clients import dynamodb_client
 from config import COURSE_TABLE, ENROLLMENT_TABLE, ORDER_TABLE
 from enrollment import (
+    Course,
+    Enrollment,
     Kind,
     LinkedEntity,
+    User,
     enroll,
 )
-from schemas import Course, Enrollment, User
 
 logger = Logger(__name__)
 order_layer = DynamoDBPersistenceLayer(ORDER_TABLE, dynamodb_client)
@@ -82,11 +82,10 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     )
 
 
-def _handler(record: Course, context: dict) -> Enrollment:
+def _handler(course: Course, context: dict) -> Enrollment:
     enrollment = Enrollment(
-        id=uuid4(),
         user=context['user'],
-        course=record,
+        course=course,
     )
 
     enroll(

enrollments-events/app/events/enroll_scheduled.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.utilities.data_classes import (
     EventBridgeEvent,
@@ -7,9 +9,8 @@ from aws_lambda_powertools.utilities.typing import LambdaContext
 from layercake.dynamodb import DynamoDBPersistenceLayer
 
 from boto3clients import dynamodb_client
-from config import (
-    ENROLLMENT_TABLE,
-)
+from config import ENROLLMENT_TABLE
+from enrollment import Enrollment, enroll
 
 logger = Logger(__name__)
 dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
@@ -21,5 +22,29 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     old_image = event.detail['old_image']
     # Key pattern `SCHEDULED#ORG#{org_id}`
     *_, org_id = old_image['id'].split('#')
+    offset_days = old_image.get('dedup_window_offset_days')
+    billing_day = old_image.get('subscription_billing_day')
+    enrollment = Enrollment(
+        course=old_image['course'],
+        user=old_image['user'],
+    )
 
-    return True
+    return enroll(
+        enrollment,
+        org={
+            'org_id': org_id,
+            'name': old_image['org_name'],
+        },
+        subscription=(
+            {
+                'org_id': org_id,
+                'billing_day': int(billing_day),
+            }
+            if billing_day
+            else None
+        ),
+        scheduled_at=datetime.fromisoformat(old_image['created_at']),
+        # Transfer the deduplication window if it exists
+        deduplication_window={'offset_days': offset_days} if offset_days else None,
+        persistence_layer=dyn,
+    )

enrollments-events/app/events/reenroll_if_failed.py

@@ -10,8 +10,7 @@ from layercake.dynamodb import DynamoDBPersistenceLayer, SortKey, TransactKey
 
 from boto3clients import dynamodb_client
 from config import ENROLLMENT_TABLE
-from enrollment import Kind, LinkedEntity, enroll
-from schemas import Course, Enrollment, User
+from enrollment import Course, Enrollment, Kind, LinkedEntity, User, enroll
 
 logger = Logger(__name__)
 dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
@@ -24,16 +23,16 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     metadata = dyn.collection.get_items(
         TransactKey(new_image['id'])
         + SortKey(
-            'METADATA#SUBSCRIPTION_COVERED',
+            sk='METADATA#SUBSCRIPTION_COVERED',
             rename_key='subscription',
         )
         + SortKey(
-            'METADATA#DEDUPLICATION_WINDOW',
+            sk='METADATA#DEDUPLICATION_WINDOW',
             path_spec='offset_days',
             rename_key='dedup_window_offset_days',
         )
         + SortKey(
-            'ORG',
+            sk='ORG',
             rename_key='org',
         ),
         flatten_top=False,