diff --git a/README.md b/README.md
index 5c96a44..bcbc3f6 100644
--- a/README.md
+++ b/README.md
@@ -62,10 +62,10 @@ Quando uma matrícula é criada, também é agendados emails/eventos.
- `REMINDER_NO_ACCESS_AFTER_3_DAYS` se o usuário não acessar o curso 3 dias após a criação.
- `REMINDER_NO_ACTIVITY_AFTER_7_DAYS` 7 dias após a última atividade do usuário no curso.
-- `REMINDER_ACCESS_PERIOD_BEFORE_15_DAYS` 30 dias antes do perído de acesso ao curso terminar.
+- `REMINDER_ACCESS_PERIOD_BEFORE_15_DAYS` 30 dias antes do período de acesso ao curso terminar.
- `REMINDER_CERT_EXPIRATION_BEFORE_30_DAYS` se houver certificado, avisa 30 dias antes do certificado expirar.
-- `COURSE_ARCHIVED` após o certificado expirar, a matrícula será marcada como **arquivada (ARCHIVED)**.
-- `COURSE_EXPIRED` se não houver certificado e o período de acesso for atingido, a matrícula será marcada com **expirada (EXPIRED)**.
+- `SET_AS_ARCHIVED` após o certificado expirar, a matrícula será marcada como **arquivada (ARCHIVED)**.
+- `SET_AS_EXPIRED` se não houver certificado e o período de acesso for atingido, a matrícula será marcada com **expirada (EXPIRED)**.
```json
{"id": "9omWNKymwU5U4aeun6mWzZ", "sk": "SCHEDULES#REMINDER_NO_ACCESS_3_DAYS", "name": "Sérgio R Siqueira", "email": "osergiosiqueira@gmail.com", "ttl": 1874507093}
diff --git a/enrollments-events/app/boto3clients.py b/enrollments-events/app/boto3clients.py
index 633c1b2..d4c4408 100644
--- a/enrollments-events/app/boto3clients.py
+++ b/enrollments-events/app/boto3clients.py
@@ -1,14 +1,22 @@
import os
+from typing import TYPE_CHECKING
import boto3
+if TYPE_CHECKING:
+ from mypy_boto3_dynamodb.client import DynamoDBClient
+ from mypy_boto3_sesv2 import SESV2Client
+else:
+ DynamoDBClient = object
+ SESV2Client = object
-def get_dynamodb_client():
+
+def get_dynamodb_client() -> DynamoDBClient:
if os.getenv('AWS_LAMBDA_FUNCTION_NAME'):
return boto3.client('dynamodb')
return boto3.client('dynamodb', endpoint_url='http://127.0.0.1:8000')
-dynamodb_client = get_dynamodb_client()
-sesv2_client = boto3.client('sesv2')
+dynamodb_client: DynamoDBClient = get_dynamodb_client()
+sesv2_client: SESV2Client = boto3.client('sesv2')
diff --git a/enrollments-events/app/events/allocate_slots.py b/enrollments-events/app/events/allocate_slots.py
index 47b1a01..253068a 100644
--- a/enrollments-events/app/events/allocate_slots.py
+++ b/enrollments-events/app/events/allocate_slots.py
@@ -34,7 +34,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
order = order_layer.collection.get_items(
TransactKey(order_id) + SortKey('0') + SortKey('items', path_spec='items'),
)
- tenant_id = order['tenant_id']
+ org_id = order['tenant_id']
items = {
item['id']: int(item['quantity'])
for item in order['items']
@@ -51,10 +51,10 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
for slot in slots:
transact.put(
item={
- 'id': f'vacancies#{tenant_id}',
+ 'id': f'vacancies#{org_id}',
'sk': f'{order_id}#{uuid4()}',
# Post-migration: uncomment the follow lines
- # 'id': f'SLOT#ORG#{tenant_id}',
+ # 'id': f'SLOT#ORG#{org_id}',
# 'sk': f'ORDER#{order_id}#ENROLLMENT#{uuid4()}',
'course': asdict(slot),
'created_at': now_,
diff --git a/enrollments-events/app/events/emails/reminder_cert_expiration_before_30_days.py b/enrollments-events/app/events/emails/reminder_cert_expiration_before_30_days.py
index 78941b7..18ca36f 100644
--- a/enrollments-events/app/events/emails/reminder_cert_expiration_before_30_days.py
+++ b/enrollments-events/app/events/emails/reminder_cert_expiration_before_30_days.py
@@ -1,12 +1,61 @@
from aws_lambda_powertools import Logger
-from aws_lambda_powertools.utilities.data_classes import EventBridgeEvent, event_source
+from aws_lambda_powertools.utilities.data_classes import (
+ EventBridgeEvent,
+ event_source,
+)
from aws_lambda_powertools.utilities.typing import LambdaContext
+from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
+
+from boto3clients import dynamodb_client, sesv2_client
+from config import (
+ EMAIL_SENDER,
+ ENROLLMENT_TABLE,
+)
+
+from .email_ import send_email
logger = Logger(__name__)
+enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
-@event_source(data_classe=EventBridgeEvent)
+SUBJECT = 'Seu certificado de {course} está prestes a expirar'
+MESSAGE = """
+Oi {first_name}, tudo bem?
+
+O certificado do curso {course} vai expirar em breve.
+Para manter sua certificação válida, é recomendável refazer o curso 30 dias antes da expiração.
+
+👉 Acesse o curso e renove sua certificação
+"""
+
+
+@event_source(data_class=EventBridgeEvent)
@logger.inject_lambda_context
def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
- new_image = event.detail['new_image']
- return True
+ """If a certificate exists, remind the user 30 days before
+ the certificate expires."""
+ old_image = event.detail['old_image']
+
+ # Post-migration: Remove the following lines
+ if 'email' not in old_image:
+ # If email is missing, use enrollment email
+ cur_image = enrollment_layer.get_item(KeyPair(old_image['id'], '0'))
+ old_image['name'] = cur_image['user']['name']
+ old_image['email'] = cur_image['user']['email']
+ old_image['course'] = cur_image['course']['name']
+
+ return send_email(
+ to=(old_image['name'], old_image['email']),
+ subject=SUBJECT,
+ message=MESSAGE,
+ context={
+ 'course': old_image['course'],
+ },
+ sender=EMAIL_SENDER,
+ sesv2_client=sesv2_client,
+ event={
+ 'id': old_image['id'],
+ 'sk': 'SCHEDULE#REMINDER_NO_ACCESS_AFTER_3_DAYS',
+ },
+ dynamodb_persistence_layer=enrollment_layer,
+ )
diff --git a/enrollments-events/app/events/emails/reminder_no_access_after_3_days.py b/enrollments-events/app/events/emails/reminder_no_access_after_3_days.py
index 1661b91..a620b6b 100644
--- a/enrollments-events/app/events/emails/reminder_no_access_after_3_days.py
+++ b/enrollments-events/app/events/emails/reminder_no_access_after_3_days.py
@@ -4,10 +4,7 @@ from aws_lambda_powertools.utilities.data_classes import (
event_source,
)
from aws_lambda_powertools.utilities.typing import LambdaContext
-from layercake.dateutils import now
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
-from layercake.email_ import Message
-from layercake.strutils import first_word, truncate_str
from boto3clients import dynamodb_client, sesv2_client
from config import (
@@ -15,26 +12,28 @@ from config import (
ENROLLMENT_TABLE,
)
+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?
-Você foi matriculado no curso de {course} há 3 dias, mas ainda não iniciou.
-Não perca a oportunidade de aprender e aproveitar ao máximo seu curso!
+Há 3 dias você foi matriculado no curso {course}.
+Ainda não começou? Não perca a oportunidade de aprender e aproveitar ao máximo seu curso!
-Clique no link para acessar seu curso:
-https://saladeaula.digital
+👉 Acesse seu curso agora
"""
-logger = Logger(__name__)
-enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
-
@event_source(data_class=EventBridgeEvent)
@logger.inject_lambda_context
def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
+ """If the user does not access the course within 3 days after
+ enrollment creation."""
old_image = event.detail['old_image']
- now_ = now()
# Post-migration: Remove the following lines
if 'email' not in old_image:
@@ -44,53 +43,18 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
old_image['email'] = cur_image['user']['email']
old_image['course'] = cur_image['course']['name']
- emailmsg = Message(
- from_=EMAIL_SENDER,
- to=(
- old_image['name'],
- old_image['email'],
- ),
- subject=SUBJECT.format(course=truncate_str(old_image['course'])),
+ return send_email(
+ to=(old_image['name'], old_image['email']),
+ subject=SUBJECT,
+ message=MESSAGE,
+ context={
+ 'course': old_image['course'],
+ },
+ sender=EMAIL_SENDER,
+ sesv2_client=sesv2_client,
+ event={
+ 'id': old_image['id'],
+ 'sk': 'SCHEDULE#REMINDER_NO_ACCESS_AFTER_3_DAYS',
+ },
+ dynamodb_persistence_layer=enrollment_layer,
)
- emailmsg.add_alternative(
- MESSAGE.format(
- first_name=first_word(old_image['name']),
- course=old_image['course'],
- )
- )
-
- try:
- sesv2_client.send_email(
- Content={
- 'Raw': {
- 'Data': emailmsg.as_bytes(),
- },
- }
- )
- logger.info('Email sent')
- except Exception as exc:
- logger.exception(exc)
-
- enrollment_layer.put_item(
- item={
- 'id': old_image['id'],
- 'sk': 'SCHEDULE#REMINDER_NO_ACCESS_AFTER_3_DAYS#FAILED',
- # Post-migration: Uncomment the following line
- # 'sk': f'{old_image["sk"]}#FAILED',
- 'created_at': now_,
- }
- )
-
- return False
- else:
- enrollment_layer.put_item(
- item={
- 'id': old_image['id'],
- 'sk': 'SCHEDULE#REMINDER_NO_ACCESS_AFTER_3_DAYS#EXECUTED',
- # Post-migration: Uncomment the following line
- # 'sk': f'{old_image["sk"]}#EXECUTED',
- 'created_at': now_,
- }
- )
-
- return True
diff --git a/enrollments-events/app/events/emails/reminder_no_activity_after_7_days.py b/enrollments-events/app/events/emails/reminder_no_activity_after_7_days.py
index 1dbb9f7..a8c81b1 100644
--- a/enrollments-events/app/events/emails/reminder_no_activity_after_7_days.py
+++ b/enrollments-events/app/events/emails/reminder_no_activity_after_7_days.py
@@ -4,10 +4,7 @@ from aws_lambda_powertools.utilities.data_classes import (
event_source,
)
from aws_lambda_powertools.utilities.typing import LambdaContext
-from layercake.dateutils import now
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
-from layercake.email_ import Message
-from layercake.strutils import first_word, truncate_str
from boto3clients import dynamodb_client, sesv2_client
from config import (
@@ -15,19 +12,28 @@ from config import (
ENROLLMENT_TABLE,
)
-SUBJECT = ''
-MESSAGE = """
-"""
+from .email_ import send_email
logger = Logger(__name__)
enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
+SUBJECT = 'Seu curso de {course} está parado há 7 dias...'
+MESSAGE = """
+Oi {first_name}, tudo bem?
+
+Percebemos que você não acessou seu curso {course} nos últimos 7 dias.
+Não deixe seu período de acesso expirar! Retome seu aprendizado agora mesmo.