diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index de812a1b4..008d19555 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -1,5 +1,6 @@ from collections import OrderedDict from datetime import datetime +import dateutil from flask import ( abort, @@ -16,7 +17,6 @@ from notifications_python_client.errors import HTTPError from notifications_utils.clients.zendesk.zendesk_client import ( NotifySupportTicket, ) -from notifications_utils.timezones import convert_utc_to_local_timezone from app import ( billing_api_client, @@ -440,8 +440,7 @@ def get_service_verify_reply_to_address_partials(service_id, notification_id): is_default=is_default ) seconds_since_sending = ( - convert_utc_to_local_timezone(datetime.utcnow().isoformat()) - - convert_utc_to_local_timezone(notification['created_at']) + datetime.utcnow() - dateutil.parser.parse(notification['created_at'], ignoretz=True) ).seconds if notification["status"] in FAILURE_STATUSES or ( notification["status"] in SENDING_STATUSES and diff --git a/app/models/job.py b/app/models/job.py index dacb1264c..b59c81ffc 100644 --- a/app/models/job.py +++ b/app/models/job.py @@ -138,23 +138,6 @@ class Job(JSONModel): def percentage_complete(self): return self.notifications_requested / self.notification_count * 100 - @property - def letter_job_can_be_cancelled(self): - - if self.template['template_type'] != 'letter': - return False - - if any(self.uncancellable_notifications): - return False - - if not letter_can_be_cancelled( - 'created', - convert_utc_to_local_timezone(self.created_at).replace(tzinfo=None) - ): - return False - - return True - @cached_property def all_notifications(self): return self.get_notifications(set_status_filters({}))['notifications'] diff --git a/app/models/user.py b/app/models/user.py index 5ce790d2e..07ce6534d 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -1,3 +1,4 @@ +import dateutil from datetime import datetime from flask import abort, request, session @@ -126,8 +127,10 @@ class User(JSONModel, UserMixin): def password_changed_more_recently_than(self, datetime_string): if not self.password_changed_at: return False + datetime_string = dateutil.parser.parse(datetime_string, ignoretz=True) + changed = dateutil.parser.parse(self.password_changed_at, ignoretz=True) return convert_utc_to_local_timezone( - self.password_changed_at + changed ) > convert_utc_to_local_timezone( datetime_string ) diff --git a/app/utils/letters.py b/app/utils/letters.py index d4e512654..1f086959f 100644 --- a/app/utils/letters.py +++ b/app/utils/letters.py @@ -4,12 +4,7 @@ import pytz from dateutil import parser from flask import url_for from notifications_utils.formatters import unescaped_formatted_list -from notifications_utils.letter_timings import letter_can_be_cancelled from notifications_utils.postal_address import PostalAddress -from notifications_utils.timezones import ( - convert_local_timezone_to_utc, - convert_utc_to_local_timezone, -) LETTER_VALIDATION_MESSAGES = { diff --git a/tests/app/main/views/service_settings/test_service_settings.py b/tests/app/main/views/service_settings/test_service_settings.py index de095d124..5146573d1 100644 --- a/tests/app/main/views/service_settings/test_service_settings.py +++ b/tests/app/main/views/service_settings/test_service_settings.py @@ -72,10 +72,6 @@ def mock_get_service_settings_page_common( 'Start text messages with service name On Change your settings for starting text messages with service name', 'Send international text messages Off Change your settings for sending international text messages', 'Receive text messages Off Change your settings for receiving text messages', - - # 'Label Value Action', - # 'Send letters Off Change your settings for sending letters', - ]), (create_platform_admin_user(), [ @@ -96,9 +92,6 @@ def mock_get_service_settings_page_common( 'Send international text messages Off Change your settings for sending international text messages', 'Receive text messages Off Change your settings for receiving text messages', - # 'Label Value Action', - # 'Send letters Off Change your settings for sending letters', - 'Label Value Action', 'Live Off Change service status', 'Count in list of live services Yes Change if service is counted in list of live services',