Merge pull request #3067 from alphagov/fix-cancel-broadcast

Fix cancel broadcast by converting reference date to string

tests/app/celery/test_service_callback_tasks.py

@@ -5,8 +5,9 @@ import pytest
 import requests_mock
 from freezegun import freeze_time
 
-from app import (DATETIME_FORMAT, encryption)
+from app import encryption
 from app.celery.service_callback_tasks import send_delivery_status_to_service, send_complaint_to_service
+from app.utils import DATETIME_FORMAT
 from tests.app.db import (
     create_complaint,
     create_notification,

tests/app/celery/test_tasks.py

@@ -16,10 +16,7 @@ from notifications_utils.template import (
 )
 from notifications_utils.columns import Row
 
-from app import (
-    DATETIME_FORMAT,
-    encryption
-)
+from app import encryption
 from app.celery import provider_tasks
 from app.celery import tasks
 from app.celery.tasks import (
@@ -52,6 +49,7 @@ from app.models import (
     SMS_TYPE,
     ReturnedLetter,
     NOTIFICATION_CREATED)
+from app.utils import DATETIME_FORMAT
 
 from tests.app import load_example_csv
 

tests/app/clients/test_cbc_proxy.py

@@ -1,11 +1,13 @@
 import json
 import uuid
 from collections import namedtuple
+from datetime import datetime
 from unittest.mock import Mock
 
 import pytest
 
 from app.clients.cbc_proxy import CBCProxyClient, CBCProxyException, CBCProxyEE, CBCProxyCanary
+from app.utils import DATETIME_FORMAT
 
 
 @pytest.fixture(scope='function')
@@ -119,13 +121,15 @@ def test_cbc_proxy_ee_create_and_send_invokes_function(mocker, cbc_proxy_ee):
 
 def test_cbc_proxy_ee_cancel_invokes_function(mocker, cbc_proxy_ee):
     identifier = 'my-identifier'
-    MockProviderMessage = namedtuple('BroadcastProviderMessage', ['id', 'message_number', 'created_at'])
+    MockProviderMessage = namedtuple(
+        'BroadcastProviderMessage', ['id', 'message_number', 'created_at']
+    )
 
     provider_messages = [
-        MockProviderMessage(uuid.uuid4(), '0000007b', '2020-12-10 11:19:44.130585'),
-        MockProviderMessage(uuid.uuid4(), '0000004e', '2020-12-10 12:19:44.130585')
+        MockProviderMessage(uuid.uuid4(), '0000007b', datetime(2020, 12, 16)),
+        MockProviderMessage(uuid.uuid4(), '0000004e', datetime(2020, 12, 17))
     ]
-    sent = '2020-12-10 14:19:44.130585'
+    sent = '2020-12-17 14:19:44.130585'
 
     ld_client_mock = mocker.patch.object(
         cbc_proxy_ee,
@@ -161,11 +165,11 @@ def test_cbc_proxy_ee_cancel_invokes_function(mocker, cbc_proxy_ee):
     assert payload['references'] == [
         {
             "message_id": str(provider_messages[0].id),
-            "sent": provider_messages[0].created_at
+            "sent": provider_messages[0].created_at.strftime(DATETIME_FORMAT)
         },
         {
             "message_id": str(provider_messages[1].id),
-            "sent": provider_messages[1].created_at
+            "sent": provider_messages[1].created_at.strftime(DATETIME_FORMAT)
         },
     ]
     assert payload['sent'] == sent
@@ -233,13 +237,16 @@ def test_cbc_proxy_vodafone_create_and_send_invokes_function(mocker, cbc_proxy_v
 
 def test_cbc_proxy_vodafone_cancel_invokes_function(mocker, cbc_proxy_vodafone):
     identifier = 'my-identifier'
-    MockProviderMessage = namedtuple('BroadcastProviderMessage', ['id', 'message_number', 'created_at'])
+    MockProviderMessage = namedtuple(
+        'BroadcastProviderMessage',
+        ['id', 'message_number', 'created_at']
+    )
 
     provider_messages = [
-        MockProviderMessage(uuid.uuid4(), 78, '2020-12-10 11:19:44.130585'),
-        MockProviderMessage(uuid.uuid4(), 123, '2020-12-10 12:19:44.130585')
+        MockProviderMessage(uuid.uuid4(), 78, datetime(2020, 12, 16)),
+        MockProviderMessage(uuid.uuid4(), 123, datetime(2020, 12, 17))
     ]
-    sent = '2020-12-10 14:19:44.130585'
+    sent = '2020-12-18 14:19:44.130585'
 
     ld_client_mock = mocker.patch.object(
         cbc_proxy_vodafone,
@@ -276,12 +283,12 @@ def test_cbc_proxy_vodafone_cancel_invokes_function(mocker, cbc_proxy_vodafone):
         {
             "message_id": str(provider_messages[0].id),
             "message_number": '0000004e',
-            "sent": provider_messages[0].created_at
+            "sent": provider_messages[0].created_at.strftime(DATETIME_FORMAT)
         },
         {
             "message_id": str(provider_messages[1].id),
             "message_number": '0000007b',
-            "sent": provider_messages[1].created_at
+            "sent": provider_messages[1].created_at.strftime(DATETIME_FORMAT)
         },
     ]
     assert payload['sent'] == sent

tests/app/template_statistics/test_rest.py

@@ -5,7 +5,7 @@ from unittest.mock import Mock
 import pytest
 from freezegun import freeze_time
 
-from app import DATETIME_FORMAT
+from app.utils import DATETIME_FORMAT
 from tests.app.db import create_ft_notification_status, create_notification
 
 

tests/app/v2/notifications/test_get_notifications.py

@@ -2,7 +2,7 @@ import datetime
 import pytest
 from flask import json, url_for
 
-from app import DATETIME_FORMAT
+from app.utils import DATETIME_FORMAT
 from tests import create_authorization_header
 from tests.app.db import (
     create_notification,

tests/app/v2/template/test_get_template.py

@@ -2,8 +2,8 @@ import pytest
 
 from flask import json
 
-from app import DATETIME_FORMAT
 from app.models import (TEMPLATE_TYPES, EMAIL_TYPE, SMS_TYPE, LETTER_TYPE,)
+from app.utils import DATETIME_FORMAT
 from tests import create_authorization_header
 from tests.app.db import create_template, create_letter_contact