add set as expired

enrollments-events/app/events/emails/reminder_access_period_before_30_days.py

@@ -54,7 +54,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
         sesv2_client=sesv2_client,
         event={
             'id': old_image['id'],
-            'sk': 'SCHEDULE#REMINDER_NO_ACCESS_AFTER_3_DAYS',
+            'sk': 'SCHEDULE#REMINDER_ACCESS_PERIOD_BEFORE_30_DAYS',
         },
         dynamodb_persistence_layer=enrollment_layer,
     )

enrollments-events/app/events/emails/reminder_cert_expiration_before_30_days.py

@@ -55,7 +55,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
         sesv2_client=sesv2_client,
         event={
             'id': old_image['id'],
-            'sk': 'SCHEDULE#REMINDER_NO_ACCESS_AFTER_3_DAYS',
+            'sk': 'SCHEDULE#REMINDER_CERT_EXPIRATION_BEFORE_30_DAYS',
         },
         dynamodb_persistence_layer=enrollment_layer,
     )

enrollments-events/app/events/emails/reminder_no_access_after_3_days.py

@@ -17,6 +17,7 @@ from .email_ import send_email
 logger = Logger(__name__)
 enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
 
+
 SUBJECT = 'Seu curso de {course} está esperando por você na EDUSEG®'
 MESSAGE = """
 Oi {first_name}, tudo bem?<br/><br/>

enrollments-events/app/events/issue_cert.py

@@ -4,7 +4,7 @@ from aws_lambda_powertools.utilities.data_classes import (
     event_source,
 )
 from aws_lambda_powertools.utilities.typing import LambdaContext
-from layercake.dynamodb import DynamoDBPersistenceLayer
+from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, SortKey, TransactKey
 
 from boto3clients import dynamodb_client
 from config import (
@@ -19,5 +19,10 @@ 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']
+    enrollment = enrollment_layer.collection.get_items(
+        TransactKey(pk=new_image['id'])
+        + SortKey('METADATA#DEDUPLICATION_WINDOW', rename_key='DEDUPLICATION_WINDOW')
+        + SortKey('METADATA#COURSE', rename_key='COURSE'),
+    )
 
     return True

enrollments-events/app/events/reenroll_if_failed.py

@@ -22,11 +22,10 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     subscription = enrollment_layer.collection.get_items(
         TransactKey(new_image['id'])
         + SortKey('METADATA#SUBSCRIPTION_COVERED')
-        + SortKey('author')
-        + SortKey('tenant')
-        # Post-migration: uncommet the following lines
-        # + SortKey('CREATED_BY')
-        # + SortKey('ORG')
+        + SortKey('author', rename_key='CREATED_BY')
+        + SortKey('tenant', rename_key='ORG')
+        + SortKey('CREATED_BY')
+        + SortKey('ORG')
     )
 
     with enrollment_layer.transact_writer() as transact_writer:

enrollments-events/app/events/schedule_reminders.py

@@ -1,5 +1,3 @@
-from datetime import timedelta
-
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.utilities.data_classes import (
     EventBridgeEvent,
@@ -15,7 +13,7 @@ from config import (
 )
 
 logger = Logger(__name__)
-enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
+dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
 
 
 @event_source(data_class=EventBridgeEvent)
@@ -27,7 +25,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     course = new_image['course']
     now_ = now()
 
-    with enrollment_layer.transact_writer() as transact:
+    with dyn.transact_writer() as transact:
         transact.put(
             item={
                 'id': enrollment_id,
@@ -48,22 +46,19 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
             item={
                 'id': enrollment_id,
                 'sk': 'SCHEDULE#SET_AS_EXPIRED',
-                'name': user.name,
-                'email': user.email,
-                'course': course.name,
                 'created_at': now_,
-                'ttl': ttl(start_dt=now_ + timedelta(days=course.access_period)),
+                'ttl': ttl(start_dt=now_, days=course.access_period),
             },
         )
         transact.put(
             item={
                 'id': enrollment_id,
-                'sk': 'REMINDER_ACCESS_PERIOD_BEFORE_15_DAYS',
+                'sk': 'SCHEDULE#REMINDER_CERT_EXPIRATION_BEFORE_30_DAYS',
                 'name': user.name,
                 'email': user.email,
                 'course': course.name,
                 'created_at': now_,
-                'ttl': ttl(start_dt=now_ + timedelta(days=course.access_period - 15)),
+                'ttl': ttl(start_dt=now_, days=course.access_period - 30),
             },
         )