diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 31aee0dd6..89211ef43 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -31,6 +31,7 @@ from app.models import ( ) from app.notifications.process_notifications import persist_notification from app.notifications.validators import check_service_over_total_message_limit +from app.schema_validation.definitions import uuid from app.serialised_models import SerialisedService, SerialisedTemplate from app.service.utils import service_allowed_to_send_to from app.utils import DATETIME_FORMAT @@ -193,6 +194,12 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i return try: + job_id = notification.get("job", None) + created_by_id = None + if job_id: + job = dao_get_job_by_id(job_id) + created_by_id = job.created_by_id + saved_notification = persist_notification( template_id=notification["template"], template_version=notification["template_version"], @@ -203,6 +210,7 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i api_key_id=None, key_type=KEY_TYPE_NORMAL, created_at=datetime.utcnow(), + created_by_id=uuid.UUID(created_by_id), job_id=notification.get("job", None), job_row_number=notification.get("row_number", None), notification_id=notification_id, diff --git a/migrations/versions/0402_total_message_limit_default.py b/migrations/versions/0402_total_message_limit_default.py index 786e60362..75539bcf1 100644 --- a/migrations/versions/0402_total_message_limit_default.py +++ b/migrations/versions/0402_total_message_limit_default.py @@ -10,8 +10,8 @@ from flask import current_app import sqlalchemy as sa -revision = '0402_total_message_limit_default' -down_revision = '0401_add_e2e_test_user' +revision = "0402_total_message_limit_default" +down_revision = "0401_add_e2e_test_user" def upgrade():