From 3dd15841a5c1988e2440492d9b102d28bd979b37 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Mon, 27 Jul 2020 15:17:19 +0100 Subject: [PATCH] create get_dt_string_or_none string mostly to quash flakle8 warnings --- app/models.py | 41 +++++++++++++++++++++-------------------- app/utils.py | 5 +++++ 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/models.py b/app/models.py index 68a4e50ca..1d8e15e60 100644 --- a/app/models.py +++ b/app/models.py @@ -39,6 +39,7 @@ from app import ( encryption, DATETIME_FORMAT, DATETIME_FORMAT_NO_TIMEZONE) +from app.utils import get_dt_string_or_none from app.history_meta import Versioned @@ -169,7 +170,7 @@ class User(db.Model): 'current_session_id': self.current_session_id, 'failed_login_count': self.failed_login_count, 'email_access_validated_at': self.email_access_validated_at.strftime(DATETIME_FORMAT), - 'logged_in_at': self.logged_in_at.strftime(DATETIME_FORMAT) if self.logged_in_at else None, + 'logged_in_at': get_dt_string_or_none(self.logged_in_at), 'mobile_number': self.mobile_number, 'organisations': [x.id for x in self.organisations if x.active], 'password_changed_at': self.password_changed_at.strftime(DATETIME_FORMAT_NO_TIMEZONE), @@ -569,7 +570,7 @@ class AnnualBilling(db.Model): 'service_id': self.service_id, 'financial_year_start': self.financial_year_start, "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, + "updated_at": get_dt_string_or_none(self.updated_at), "service": serialize_service() if self.service else None, } @@ -600,7 +601,7 @@ class InboundNumber(db.Model): "service": serialize_service() if self.service else None, "active": self.active, "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, + "updated_at": get_dt_string_or_none(self.updated_at), } @@ -631,7 +632,7 @@ class ServiceSmsSender(db.Model): "archived": self.archived, "inbound_number_id": str(self.inbound_number_id) if self.inbound_number_id else None, "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, + "updated_at": get_dt_string_or_none(self.updated_at), } @@ -723,7 +724,7 @@ class ServiceInboundApi(db.Model, Versioned): "url": self.url, "updated_by_id": str(self.updated_by_id), "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None + "updated_at": get_dt_string_or_none(self.updated_at), } @@ -762,7 +763,7 @@ class ServiceCallbackApi(db.Model, Versioned): "url": self.url, "updated_by_id": str(self.updated_by_id), "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None + "updated_at": get_dt_string_or_none(self.updated_at), } @@ -996,7 +997,7 @@ class TemplateBase(db.Model): "id": str(self.id), "type": self.template_type, "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, + "updated_at": get_dt_string_or_none(self.updated_at), "created_by": self.created_by.email_address, "version": self.version, "body": self.content, @@ -1628,7 +1629,7 @@ class Notification(db.Model): "subject": self.subject, "created_at": self.created_at.strftime(DATETIME_FORMAT), "created_by_name": self.get_created_by_name(), - "sent_at": self.sent_at.strftime(DATETIME_FORMAT) if self.sent_at else None, + "sent_at": get_dt_string_or_none(self.sent_at), "completed_at": self.completed_at(), "scheduled_for": None, "postage": self.postage @@ -1955,7 +1956,7 @@ class ServiceEmailReplyTo(db.Model): 'is_default': self.is_default, 'archived': self.archived, 'created_at': self.created_at.strftime(DATETIME_FORMAT), - 'updated_at': self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None + 'updated_at': get_dt_string_or_none(self.updated_at), } @@ -1981,7 +1982,7 @@ class ServiceLetterContact(db.Model): 'is_default': self.is_default, 'archived': self.archived, 'created_at': self.created_at.strftime(DATETIME_FORMAT), - 'updated_at': self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None + 'updated_at': get_dt_string_or_none(self.updated_at), } @@ -2058,7 +2059,7 @@ class Complaint(db.Model): 'service_name': self.service.name, 'ses_feedback_id': str(self.ses_feedback_id), 'complaint_type': self.complaint_type, - 'complaint_date': self.complaint_date.strftime(DATETIME_FORMAT) if self.complaint_date else None, + 'complaint_date': get_dt_string_or_none(self.complaint_date), 'created_at': self.created_at.strftime(DATETIME_FORMAT), } @@ -2092,7 +2093,7 @@ class ServiceDataRetention(db.Model): "notification_type": self.notification_type, "days_of_retention": self.days_of_retention, "created_at": self.created_at.strftime(DATETIME_FORMAT), - "updated_at": self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, + "updated_at": get_dt_string_or_none(self.updated_at), } @@ -2266,13 +2267,13 @@ class BroadcastMessage(db.Model): 'status': self.status, - 'starts_at': self.starts_at.strftime(DATETIME_FORMAT) if self.starts_at else None, - 'finishes_at': self.finishes_at.strftime(DATETIME_FORMAT) if self.finishes_at else None, + 'starts_at': get_dt_string_or_none(self.starts_at), + 'finishes_at': get_dt_string_or_none(self.finishes_at), - 'created_at': self.created_at.strftime(DATETIME_FORMAT) if self.created_at else None, - 'approved_at': self.approved_at.strftime(DATETIME_FORMAT) if self.approved_at else None, - 'cancelled_at': self.cancelled_at.strftime(DATETIME_FORMAT) if self.cancelled_at else None, - 'updated_at': self.updated_at.strftime(DATETIME_FORMAT) if self.updated_at else None, + 'created_at': get_dt_string_or_none(self.created_at), + 'approved_at': get_dt_string_or_none(self.approved_at), + 'cancelled_at': get_dt_string_or_none(self.cancelled_at), + 'updated_at': get_dt_string_or_none(self.updated_at), 'created_by_id': str(self.created_by_id), 'approved_by_id': str(self.approved_by_id), @@ -2353,6 +2354,6 @@ class BroadcastEvent(db.Model): 'transmitted_areas': self.transmitted_areas, 'transmitted_sender': self.transmitted_sender, - 'transmitted_starts_at': self.updated_at.strftime(DATETIME_FORMAT) if self.transmitted_starts_at else None, - 'transmitted_finishes_at': self.updated_at.strftime(DATETIME_FORMAT) if self.transmitted_finishes_at else None, + 'transmitted_starts_at': get_dt_string_or_none(self.transmitted_starts_at), + 'transmitted_finishes_at': get_dt_string_or_none(self.transmitted_finishes_at), } diff --git a/app/utils.py b/app/utils.py index 8c6f270a6..719958399 100644 --- a/app/utils.py +++ b/app/utils.py @@ -11,6 +11,7 @@ from notifications_utils.template import ( BroadcastMessageTemplate, ) +from app import DATETIME_FORMAT local_timezone = pytz.timezone("Europe/London") @@ -141,3 +142,7 @@ def get_notification_table_to_use(service, notification_type, process_day, has_d def get_archived_db_column_value(column): date = datetime.utcnow().strftime("%Y-%m-%d") return f'_archived_{date}_{column}' + + +def get_dt_string_or_none(val): + return val.strftime(DATETIME_FORMAT) if val else None