Bump notifications-utils to 3.7.0

Bumped notifications-utils to 3.7.0. Version 3.7.0 includes the
`convert_utc_to_bst` and `convert_bst_to_utc` functions and the
`LETTER_PROCESSING_DEADLINE` constant, so these have been removed from
this repo and anywhere using these has now been updated to get these
from `notifications-utils`.

Also bumped pytest by a patch version to bring in a bug fix.

app/celery/tasks.py

@@ -11,6 +11,7 @@ from notifications_utils.template import (
     SMSMessageTemplate,
     WithSubjectTemplate,
 )
+from notifications_utils.timezones import convert_utc_to_bst
 from requests import (
     HTTPError,
     request,
@@ -72,7 +73,6 @@ from app.models import (
 )
 from app.notifications.process_notifications import persist_notification
 from app.service.utils import service_allowed_to_send_to
-from app.utils import convert_utc_to_bst
 
 
 @notify_celery.task(name="process-job")

app/clients/performance_platform/performance_platform_client.py

@@ -4,7 +4,7 @@ import json
 from flask import current_app
 import requests
 
-from app.utils import convert_utc_to_bst
+from notifications_utils.timezones import convert_utc_to_bst
 
 
 class PerformancePlatformClient:

app/config.py

@@ -1,4 +1,4 @@
-from datetime import timedelta, time
+from datetime import timedelta
 import os
 import json
 
@@ -318,8 +318,6 @@ class Config(object):
     DOCUMENT_DOWNLOAD_API_HOST = os.environ.get('DOCUMENT_DOWNLOAD_API_HOST', 'http://localhost:7000')
     DOCUMENT_DOWNLOAD_API_KEY = os.environ.get('DOCUMENT_DOWNLOAD_API_KEY', 'auth-token')
 
-    LETTER_PROCESSING_DEADLINE = time(17, 30)
-
     MMG_URL = "https://api.mmg.co.uk/json/api.php"
     AWS_REGION = 'eu-west-1'
 

app/dao/date_util.py

@@ -1,9 +1,8 @@
 from datetime import datetime, timedelta
 
+from notifications_utils.timezones import convert_bst_to_utc
 import pytz
 
-from app.utils import convert_bst_to_utc
-
 
 def get_months_for_financial_year(year):
     return [

app/dao/fact_billing_dao.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta, time
 
 from flask import current_app
+from notifications_utils.timezones import convert_bst_to_utc, convert_utc_to_bst
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy import func, case, desc, Date, Integer
 
@@ -20,7 +21,6 @@ from app.models import (
     EMAIL_TYPE,
     NOTIFICATION_STATUS_TYPES_BILLABLE_FOR_LETTERS
 )
-from app.utils import convert_utc_to_bst, convert_bst_to_utc
 
 
 def fetch_billing_totals_for_year(service_id, year):

app/dao/fact_notification_status_dao.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta, time
 
 from flask import current_app
+from notifications_utils.timezones import convert_bst_to_utc
 from sqlalchemy import func
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.sql.expression import literal
@@ -8,7 +9,7 @@ from sqlalchemy.types import DateTime, Integer
 
 from app import db
 from app.models import Notification, NotificationHistory, FactNotificationStatus, KEY_TYPE_TEST
-from app.utils import convert_bst_to_utc, get_london_midnight_in_utc, midnight_n_days_ago
+from app.utils import get_london_midnight_in_utc, midnight_n_days_ago
 
 
 def fetch_notification_status_for_day(process_day, service_id=None):

app/dao/notifications_dao.py

@@ -20,6 +20,7 @@ from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import case
 from sqlalchemy.sql import functions
 from notifications_utils.international_billing_rates import INTERNATIONAL_BILLING_RATES
+from notifications_utils.timezones import convert_utc_to_bst
 
 from app import db, create_uuid
 from app.aws.s3 import remove_s3_object, get_s3_bucket_objects
@@ -48,7 +49,7 @@ from app.models import (
 )
 
 from app.dao.dao_utils import transactional
-from app.utils import convert_utc_to_bst, get_london_midnight_in_utc
+from app.utils import get_london_midnight_in_utc
 
 
 @statsd(namespace="dao")

app/letters/utils.py

@@ -4,10 +4,11 @@ from enum import Enum
 import boto3
 from flask import current_app
 
+from notifications_utils.letter_timings import LETTER_PROCESSING_DEADLINE
 from notifications_utils.s3 import s3upload
+from notifications_utils.timezones import convert_utc_to_bst
 
 from app.models import KEY_TYPE_TEST, SECOND_CLASS, RESOLVE_POSTAGE_FOR_FILE_NAME, NOTIFICATION_VALIDATION_FAILED
-from app.utils import convert_utc_to_bst
 
 
 class ScanErrorType(Enum):
@@ -26,7 +27,7 @@ def get_folder_name(_now, is_test_or_scan_letter=False):
         folder_name = ''
     else:
         print_datetime = convert_utc_to_bst(_now)
-        if print_datetime.time() > current_app.config.get('LETTER_PROCESSING_DEADLINE'):
+        if print_datetime.time() > LETTER_PROCESSING_DEADLINE:
             print_datetime += timedelta(days=1)
         folder_name = '{}/'.format(print_datetime.date())
     return folder_name

app/models.py

@@ -26,6 +26,7 @@ from notifications_utils.template import (
     SMSMessageTemplate,
     LetterPrintTemplate,
 )
+from notifications_utils.timezones import convert_bst_to_utc, convert_utc_to_bst
 
 from app.encryption import (
     hashpw,
@@ -38,7 +39,6 @@ from app import (
 )
 
 from app.history_meta import Versioned
-from app.utils import convert_utc_to_bst, convert_bst_to_utc
 
 SMS_TYPE = 'sms'
 EMAIL_TYPE = 'email'

app/notifications/process_notifications.py

@@ -9,6 +9,7 @@ from notifications_utils.recipients import (
     validate_and_format_phone_number,
     format_email_address
 )
+from notifications_utils.timezones import convert_bst_to_utc, convert_utc_to_bst
 
 from app import redis_store
 from app.celery import provider_tasks
@@ -34,8 +35,6 @@ from app.v2.errors import BadRequestError
 from app.utils import (
     cache_key_for_service_template_counter,
     cache_key_for_service_template_usage_per_day,
-    convert_bst_to_utc,
-    convert_utc_to_bst,
     get_template_instance,
 )
 

app/notifications/receive_notifications.py

@@ -3,6 +3,7 @@ from urllib.parse import unquote
 import iso8601
 from flask import jsonify, Blueprint, current_app, request, abort
 from notifications_utils.recipients import try_validate_and_format_phone_number
+from notifications_utils.timezones import convert_bst_to_utc
 
 from app import statsd_client
 from app.celery import tasks
@@ -11,7 +12,6 @@ from app.dao.services_dao import dao_fetch_service_by_inbound_number
 from app.dao.inbound_sms_dao import dao_create_inbound_sms
 from app.models import InboundSms, INBOUND_SMS_TYPE, SMS_TYPE
 from app.errors import register_errors
-from app.utils import convert_bst_to_utc
 
 receive_notifications_blueprint = Blueprint('receive_notifications', __name__)
 register_errors(receive_notifications_blueprint)

app/service/statistics.py

@@ -1,8 +1,9 @@
 from collections import defaultdict
 from datetime import datetime
 
+from notifications_utils.timezones import convert_utc_to_bst
+
 from app.models import NOTIFICATION_STATUS_TYPES, TEMPLATE_TYPES
-from app.utils import convert_utc_to_bst
 from app.dao.date_util import get_months_for_financial_year
 
 

app/utils.py

@@ -4,6 +4,7 @@ import pytz
 from flask import url_for
 from sqlalchemy import func
 from notifications_utils.template import SMSMessageTemplate, WithSubjectTemplate
+from notifications_utils.timezones import convert_utc_to_bst
 
 local_timezone = pytz.timezone("Europe/London")
 
@@ -51,14 +52,6 @@ def get_midnight_for_day_before(date):
     return get_london_midnight_in_utc(day_before)
 
 
-def convert_utc_to_bst(utc_dt):
-    return pytz.utc.localize(utc_dt).astimezone(local_timezone).replace(tzinfo=None)
-
-
-def convert_bst_to_utc(date):
-    return local_timezone.localize(date).astimezone(pytz.UTC).replace(tzinfo=None)
-
-
 def get_london_month_from_utc_column(column):
     """
      Where queries need to count notifications by month it needs to be

requirements-app.txt

@@ -29,6 +29,6 @@ awscli-cwlogs>=1.4,<1.5
 # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
 itsdangerous==0.24  # pyup: <1.0.0
 
-git+https://github.com/alphagov/notifications-utils.git@30.5.6#egg=notifications-utils==30.5.6
+git+https://github.com/alphagov/notifications-utils.git@30.7.0#egg=notifications-utils==30.7.0
 
 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3

requirements.txt

@@ -31,21 +31,21 @@ awscli-cwlogs>=1.4,<1.5
 # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
 itsdangerous==0.24  # pyup: <1.0.0
 
-git+https://github.com/alphagov/notifications-utils.git@30.5.6#egg=notifications-utils==30.5.6
+git+https://github.com/alphagov/notifications-utils.git@30.7.0#egg=notifications-utils==30.7.0
 
 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3
 
 ## The following requirements were added by pip freeze:
-alembic==1.0.2
+alembic==1.0.3
 amqp==1.4.9
 anyjson==0.3.3
 attrs==18.2.0
-awscli==1.16.53
+awscli==1.16.61
 bcrypt==3.1.4
 billiard==3.3.0.23
 bleach==2.1.3
 boto3==1.6.16
-botocore==1.12.43
+botocore==1.12.51
 certifi==2018.10.15
 chardet==3.0.4
 Click==7.0
@@ -68,7 +68,7 @@ phonenumbers==8.9.4
 pyasn1==0.4.4
 pycparser==2.19
 PyPDF2==1.26.0
-pyrsistent==0.14.5
+pyrsistent==0.14.7
 python-dateutil==2.7.5
 python-editor==1.0.3
 python-json-logger==0.1.8

requirements_for_test.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 flake8==3.6.0
-pytest==3.10.0
+pytest==3.10.1
 moto==1.3.7
 pytest-env==0.6.2
 pytest-mock==1.10.0

tests/app/dao/test_ft_billing_dao.py

@@ -6,6 +6,8 @@ from freezegun import freeze_time
 
 import pytest
 
+from notifications_utils.timezones import convert_utc_to_bst
+
 from app import db
 from app.dao.fact_billing_dao import (
     delete_billing_data_for_service_for_day,
@@ -20,7 +22,6 @@ from app.models import (
     Notification,
     NOTIFICATION_STATUS_TYPES,
 )
-from app.utils import convert_utc_to_bst
 from tests.app.db import (
     create_ft_billing,
     create_service,

tests/app/test_utils.py

@@ -6,8 +6,6 @@ from freezegun import freeze_time
 from app.utils import (
     get_london_midnight_in_utc,
     get_midnight_for_day_before,
-    convert_utc_to_bst,
-    convert_bst_to_utc,
     midnight_n_days_ago,
     last_n_days
 )
@@ -31,26 +29,6 @@ def test_get_midnight_for_day_before_returns_expected_date(date, expected_date):
     assert get_midnight_for_day_before(date) == expected_date
 
 
-@pytest.mark.parametrize('date, expected_date', [
-    (datetime(2017, 3, 26, 23, 0), datetime(2017, 3, 27, 0, 0)),    # 2017 BST switchover
-    (datetime(2017, 3, 20, 23, 0), datetime(2017, 3, 20, 23, 0)),
-    (datetime(2017, 3, 28, 10, 0), datetime(2017, 3, 28, 11, 0)),
-    (datetime(2017, 10, 28, 1, 0), datetime(2017, 10, 28, 2, 0)),
-    (datetime(2017, 10, 29, 1, 0), datetime(2017, 10, 29, 1, 0)),
-    (datetime(2017, 5, 12, 14), datetime(2017, 5, 12, 15, 0))
-])
-def test_get_utc_in_bst_returns_expected_date(date, expected_date):
-    ret_date = convert_utc_to_bst(date)
-    assert ret_date == expected_date
-
-
-def test_convert_bst_to_utc():
-    bst = "2017-05-12 13:15"
-    bst_datetime = datetime.strptime(bst, "%Y-%m-%d %H:%M")
-    utc = convert_bst_to_utc(bst_datetime)
-    assert utc == datetime(2017, 5, 12, 12, 15)
-
-
 @pytest.mark.parametrize('current_time, arg, expected_datetime', [
     # winter
     ('2018-01-10 23:59', 1, datetime(2018, 1, 9, 0, 0)),