initial

app/celery/provider_tasks.py

@@ -1,6 +1,5 @@
 from datetime import datetime, timedelta
 from time import time
-from zoneinfo import ZoneInfo
 
 from flask import current_app
 from sqlalchemy.orm.exc import NoResultFound
@@ -18,8 +17,8 @@ from app.dao.notifications_dao import (
 from app.delivery import send_to_providers
 from app.exceptions import NotificationTechnicalFailureException
 from app.models import (
+    NOTIFICATION_DELIVERED,
     NOTIFICATION_FAILED,
-    NOTIFICATION_SENT,
     NOTIFICATION_TECHNICAL_FAILURE,
 )
 
@@ -37,15 +36,15 @@ def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
     """
     status, provider_response = aws_cloudwatch_client.check_sms(message_id, notification_id, sent_at)
     if status == 'success':
-        status = NOTIFICATION_SENT
+        status = NOTIFICATION_DELIVERED
     else:
         status = NOTIFICATION_FAILED
     update_notification_status_by_id(notification_id, status, provider_response=provider_response)
     current_app.logger.info(f"Updated notification {notification_id} with response '{provider_response}'")
 
-    if status == NOTIFICATION_SENT:
+    if status == NOTIFICATION_DELIVERED:
         insert_notification_history_delete_notifications_by_id(notification_id)
-        current_app.logger.info(f"Archived notification {notification_id} that was successfully sent")
+        current_app.logger.info(f"Archived notification {notification_id} that was successfully delivered")
 
 
 @notify_celery.task(bind=True, name="deliver_sms", max_retries=48, default_retry_delay=300)
@@ -58,9 +57,9 @@ def deliver_sms(self, notification_id):
         if not notification:
             raise NoResultFound()
         message_id = send_to_providers.send_sms_to_provider(notification)
-        # We have to put it in the default US/Eastern timezone.  From zones west of there, the delay
+        # We have to put it in UTC.  For other timezones, the delay
         # will be ignored and it will fire immediately (although this probably only affects developer testing)
-        my_eta = datetime.now(ZoneInfo('US/Eastern')) + timedelta(seconds=300)
+        my_eta = datetime.utcnow() + timedelta(seconds=300)
         check_sms_delivery_receipt.apply_async(
             [message_id, notification_id, now],
             eta=my_eta,