improve report

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

@@ -1,14 +1,13 @@
-from typing import TYPE_CHECKING, TypedDict
+from typing import TYPE_CHECKING
 
 from aws_lambda_powertools import Logger
-from layercake.dateutils import now
-from layercake.dynamodb import DynamoDBPersistenceLayer
 from layercake.email_ import Message
 from layercake.strutils import first_word, truncate_str
 
 from . import (
     reminder_access_period_before_30_days,
     reminder_cert_expiration_before_30_days,
+    reminder_cert_expired,
     reminder_no_access_after_3_days,
     reminder_no_activity_after_7_days,
 )
@@ -18,7 +17,6 @@ if TYPE_CHECKING:
 else:
     SESV2Client = object
 
-Event = TypedDict('Event', {'id': str, 'sk': str})
 
 TEMPLATES = {
     'reminder_access_period_before_30_days': {
@@ -29,6 +27,10 @@ TEMPLATES = {
         'subject': reminder_cert_expiration_before_30_days.SUBJECT,
         'message': reminder_cert_expiration_before_30_days.MESSAGE,
     },
+    'reminder_cert_expired': {
+        'subject': reminder_cert_expired.SUBJECT,
+        'message': reminder_cert_expired.MESSAGE,
+    },
     'reminder_no_access_after_3_days': {
         'subject': reminder_no_access_after_3_days.SUBJECT,
         'message': reminder_no_access_after_3_days.MESSAGE,
@@ -49,13 +51,9 @@ def send_email(
     context: dict = {},
     *,
     sender: tuple[str, str],
-    event: Event,
     sesv2_client: SESV2Client,
-    dynamodb_persistence_layer: DynamoDBPersistenceLayer,
-) -> bool:
-    now_ = now()
+) -> None:
     name, _ = to
-    event_name = event['sk']
     emailmsg = Message(
         from_=sender,
         to=to,
@@ -70,33 +68,10 @@ def send_email(
         )
     )
 
-    try:
-        sesv2_client.send_email(
-            Content={
-                'Raw': {
-                    'Data': emailmsg.as_bytes(),
-                },
-            }
-        )
-        dynamodb_persistence_layer.put_item(
-            item={
-                'id': event['id'],
-                'sk': f'{event_name}#EXECUTED',
-                'created_at': now_,
-            }
-        )
-        logger.info('Email sent')
-    except Exception as exc:
-        logger.exception(exc)
-
-        dynamodb_persistence_layer.put_item(
-            item={
-                'id': event['id'],
-                'sk': f'{event_name}#FAILED',
-                'created_at': now_,
-            }
-        )
-
-        return False
-    else:
-        return True
+    sesv2_client.send_email(
+        Content={
+            'Raw': {
+                'Data': emailmsg.as_bytes(),
+            },
+        }
+    )