wip reenroll

enrollments-events/app/events/enroll.py

@@ -18,7 +18,7 @@ from layercake.dynamodb import (
 
 from boto3clients import dynamodb_client
 from config import COURSE_TABLE, ENROLLMENT_TABLE, ORDER_TABLE
-from enrollment import DeduplicationWindow, LinkedEntity, enroll
+from enrollment import LinkedEntity, enroll
 from schemas import Course, Enrollment, User
 
 logger = Logger(__name__)
@@ -88,12 +88,8 @@ def _handler(record: Course, context: dict) -> Enrollment:
     enroll(
         enrollment,
         persistence_layer=enrollment_layer,
-        deduplication_window=DeduplicationWindow(offset_days=90),
-        linked_entities=frozenset(
-            {
-                LinkedEntity(context['order_id'], 'ORDER'),
-            }
-        ),
+        deduplication_window={'offset_days': 90},
+        linked_entities=frozenset({LinkedEntity(context['order_id'], 'ORDER')}),
     )
 
     return enrollment

enrollments-events/app/events/issue_cert.py

@@ -49,6 +49,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
                 'started_at': started_at.strftime('%d/%m/%Y'),
                 'completed_at': completed_at.strftime('%d/%m/%Y'),
                 'today': _datefmt(now_),
+                'year': now_.strftime('%Y'),
             },
         },
     )

enrollments-events/app/events/reenroll_if_failed.py

@@ -1,3 +1,5 @@
+from uuid import uuid4
+
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.utilities.data_classes import (
     EventBridgeEvent,
@@ -10,6 +12,8 @@ from boto3clients import dynamodb_client
 from config import (
     ENROLLMENT_TABLE,
 )
+from enrollment import LinkedEntity, enroll
+from schemas import Course, Enrollment, User
 
 logger = Logger(__name__)
 enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
@@ -19,11 +23,31 @@ enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
 @logger.inject_lambda_context
 def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     new_image = event.detail['new_image']
-    data = enrollment_layer.collection.get_items(
+    metadata = enrollment_layer.collection.get_items(
         TransactKey(new_image['id'])
         + SortKey('METADATA#SUBSCRIPTION_COVERED', rename_key='subscription')
-        + SortKey('author', rename_key='created_by')
-        + SortKey('tenant', rename_key='org')
+        + SortKey('METADATA#COURSE', rename_key='course')
+        + SortKey(
+            'METADATA#DEDUPLICATION_WINDOW',
+            path_spec='offset_days',
+            rename_key='dedup_window_offset_days',
+        )
+        + SortKey('konviva')
+        + SortKey('tenant', rename_key='org'),
+        # Post-migration: uncomment the following lines
+        # + SortKey('KONVIVA', rename_key='konviva')
+        # + SortKey('ORG', rename_key='org'),
+        flatten_top=False,
     )
+    user = User.model_validate(new_image['user'])
+    course = Course.model_validate(new_image['course'] | metadata['course'])
+    enrollment = Enrollment(id=uuid4(), course=course, user=user)
+    subscription = metadata['subscription'] if 'subscription' in metadata else None
 
-    return True
+    return enroll(
+        enrollment,
+        subscription=subscription,
+        deduplication_window={'offset_days': metadata['dedup_window_offset_days']},
+        linked_entities=frozenset({LinkedEntity(new_image['id'], 'ENROLLMENT')}),
+        persistence_layer=enrollment_layer,
+    )