merge from main

app/celery/tasks.py

@@ -31,7 +31,6 @@ 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
@@ -210,7 +209,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),
+            created_by_id=created_by_id,
             job_id=notification.get("job", None),
             job_row_number=notification.get("row_number", None),
             notification_id=notification_id,

app/clients/cloudwatch/aws_cloudwatch.py

@@ -79,13 +79,14 @@ class AwsCloudwatchClient(Client):
         return all_log_events
 
     def check_sms(self, message_id, notification_id, created_at):
+        region = cloud_config.sns_region
         # TODO this clumsy approach to getting the account number will be fixed as part of notify-api #258
         account_number = cloud_config.ses_domain_arn
-        account_number = account_number.replace("arn:aws:ses:us-west-2:", "")
+        account_number = account_number.replace(f"arn:aws:ses:{region}:", "")
         account_number = account_number.split(":")
         account_number = account_number[0]
 
-        log_group_name = f"sns/us-west-2/{account_number}/DirectPublishToPhoneNumber"
+        log_group_name = f"sns/{region}/{account_number}/DirectPublishToPhoneNumber"
         filter_pattern = '{$.notification.messageId="XXXXX"}'
         filter_pattern = filter_pattern.replace("XXXXX", message_id)
         all_log_events = self._get_log(filter_pattern, log_group_name, created_at)
@@ -96,7 +97,7 @@ class AwsCloudwatchClient(Client):
             return "success", message["delivery"]["providerResponse"]
 
         log_group_name = (
-            f"sns/us-west-2/{account_number}/DirectPublishToPhoneNumber/Failure"
+            f"sns/{region}/{account_number}/DirectPublishToPhoneNumber/Failure"
         )
         all_failed_events = self._get_log(filter_pattern, log_group_name, created_at)
         if all_failed_events and len(all_failed_events) > 0:

app/commands.py

@@ -263,6 +263,7 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
     # "send_texts,send_emails,view_activity"
     from app.service_invite.rest import create_invited_user
 
+    current_app.logger.info("ENTER")
     file = open(file_name)
     for email_address in file:
         data = {
@@ -273,6 +274,7 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
             "auth_type": auth_type,
             "invite_link_host": current_app.config["ADMIN_BASE_URL"],
         }
+        current_app.logger.info(f"DATA = {data}")
         with current_app.test_request_context(
             path="/service/{}/invite/".format(service_id),
             method="POST",
@@ -281,6 +283,7 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
         ):
             try:
                 response = create_invited_user(service_id)
+                current_app.logger.info(f"RESPONSE {response[1]}")
                 if response[1] != 201:
                     print(
                         "*** ERROR occurred for email address: {}".format(