From 1fdad3099ba91089f1b13e7d8d94538bf9ef8eee Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 8 Dec 2023 13:15:40 -0500
Subject: [PATCH] Working on tests.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/notifications/process_notifications.py     | 18 +++++-------------
 .../service_invite/test_service_invite_rest.py |  8 ++++++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/notifications/process_notifications.py b/app/notifications/process_notifications.py
index 08b8963a5..99272f6b0 100644
--- a/app/notifications/process_notifications.py
+++ b/app/notifications/process_notifications.py
@@ -87,9 +87,7 @@ def persist_notification(
     if not notification_id:
         notification_id = uuid.uuid4()
 
-    current_app.logger.info(
-        "Persisting notification with id {}".format(notification_id)
-    )
+    current_app.logger.info(f"Persisting notification with id {notification_id}")
 
     notification = Notification(
         id=notification_id,
@@ -124,9 +122,7 @@ def persist_notification(
         notification.phone_prefix = recipient_info.country_prefix
         notification.rate_multiplier = recipient_info.billable_units
     elif notification_type == EMAIL_TYPE:
-        current_app.logger.info(
-            "Persisting notification with type: {}".format(EMAIL_TYPE)
-        )
+        current_app.logger.info(f"Persisting notification with type: {EMAIL_TYPE}")
         notification.normalised_to = format_email_address(notification.to)
 
     # if simulated create a Notification model to return but do not persist the Notification to the dB
@@ -141,9 +137,7 @@ def persist_notification(
             )
 
         current_app.logger.info(
-            "{} {} created at {}".format(
-                notification_type, notification_id, notification_created_at
-            )
+            f"{notification_type} {notification_id} created at {notification_created_at}"
         )
     return notification
 
@@ -170,15 +164,13 @@ def send_notification_to_queue_detached(
         raise
 
     current_app.logger.debug(
-        "{} {} sent to the {} queue for delivery".format(
-            notification_type, notification_id, queue
-        )
+        f"{notification_type} {notification_id} sent to the {queue} queue for delivery"
     )
 
 
 def send_notification_to_queue(notification, queue=None):
     send_notification_to_queue_detached(
-        notification.key_type, notification.notification_type, notification.id, queue
+        notification.key_type, notification.notification_type, notification.id, queue,
     )
 
 
diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py
index 80d32a3e4..f13aa73ac 100644
--- a/tests/app/service_invite/test_service_invite_rest.py
+++ b/tests/app/service_invite/test_service_invite_rest.py
@@ -1,3 +1,4 @@
+from functools import partial
 import json
 import uuid
 
@@ -202,9 +203,12 @@ def test_get_invited_user_by_service_when_user_does_not_belong_to_the_service(
     assert json_resp["result"] == "error"
 
 
-def test_resend_expired_invite(client, sample_expired_user):
+def test_resend_expired_invite(client, sample_expired_user, mocker):
     url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}"
-    # TODO: Don't actually send email, need to mock it out.
+    mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue")
+    mock_persist = mocker.patch("app.service_invite.rest.persist_notification")
+    from app.notifications.process_notifications import persist_notification
+    mock_persist.side_effect = partial(persist_notification, simulated=True)
     auth_header = create_admin_authorization_header()
     response = client.post(
         url,