Cleaning up with black, isort, flake8.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>

app/dao/fact_billing_dao.py

@@ -8,7 +8,7 @@ from sqlalchemy.sql.expression import case, literal
 from app import db
 from app.dao.date_util import get_calendar_year_dates, get_calendar_year_for_datetime
 from app.dao.organization_dao import dao_get_organization_live_services
-from app.enums import NotificationStatus, NotificationType, KeyType
+from app.enums import KeyType, NotificationStatus, NotificationType
 from app.models import (
     AnnualBilling,
     FactBilling,

app/dao/fact_notification_status_dao.py

@@ -7,7 +7,7 @@ from sqlalchemy.types import DateTime, Integer
 
 from app import db
 from app.dao.dao_utils import autocommit
-from app.enums import NotificationType, NotificationStatus, KeyType
+from app.enums import KeyType, NotificationStatus, NotificationType
 from app.models import (
     FactNotificationStatus,
     Notification,
@@ -529,7 +529,10 @@ def fetch_monthly_notification_statuses_per_service(start_date, end_date):
                     [
                         (
                             FactNotificationStatus.notification_status.in_(
-                                [NotificationStatus.TECHNICAL_FAILURE, NotificationStatus.FAILED]
+                                [
+                                    NotificationStatus.TECHNICAL_FAILURE,
+                                    NotificationStatus.FAILED,
+                                ]
                             ),
                             FactNotificationStatus.notification_count,
                         )

app/dao/notifications_dao.py

@@ -16,12 +16,8 @@ from werkzeug.datastructures import MultiDict
 
 from app import create_uuid, db
 from app.dao.dao_utils import autocommit
-from app.enums import NotificationType, NotificationStatus, KeyType
-from app.models import (
-    FactNotificationStatus,
-    Notification,
-    NotificationHistory,
-)
+from app.enums import KeyType, NotificationStatus, NotificationType
+from app.models import FactNotificationStatus, Notification, NotificationHistory
 from app.utils import (
     escape_special_characters,
     get_midnight_in_utc,
@@ -162,7 +158,10 @@ def update_notification_status_by_reference(reference, status):
         )
         return None
 
-    if notification.status not in {NotificationStatus.SENDING, NotificationStatus.PENDING}:
+    if notification.status not in {
+        NotificationStatus.SENDING,
+        NotificationStatus.PENDING,
+    }:
         _duplicate_update_warning(notification, status)
         return None
 
@@ -200,7 +199,9 @@ def dao_get_notification_count_for_service(*, service_id):
 
 
 def dao_get_failed_notification_count():
-    failed_count = Notification.query.filter_by(status=NotificationStatus.FAILED).count()
+    failed_count = Notification.query.filter_by(
+        status=NotificationStatus.FAILED
+    ).count()
     return failed_count
 
 

app/dao/service_callback_api_dao.py

@@ -3,9 +3,7 @@ from datetime import datetime
 from app import create_uuid, db
 from app.dao.dao_utils import autocommit, version_class
 from app.enums import CallbackType
-from app.models import (
-    ServiceCallbackApi,
-)
+from app.models import ServiceCallbackApi
 
 
 @autocommit
@@ -39,13 +37,15 @@ def get_service_callback_api(service_callback_api_id, service_id):
 
 def get_service_delivery_status_callback_api_for_service(service_id):
     return ServiceCallbackApi.query.filter_by(
-        service_id=service_id, callback_type=CallbackType.DELIVERY_STATUS,
+        service_id=service_id,
+        callback_type=CallbackType.DELIVERY_STATUS,
     ).first()
 
 
 def get_service_complaint_callback_api_for_service(service_id):
     return ServiceCallbackApi.query.filter_by(
-        service_id=service_id, callback_type=CallbackType.COMPLAINT,
+        service_id=service_id,
+        callback_type=CallbackType.COMPLAINT,
     ).first()
 
 

app/dao/services_dao.py

@@ -13,7 +13,12 @@ from app.dao.organization_dao import dao_get_organization_by_email_address
 from app.dao.service_sms_sender_dao import insert_service_sms_sender
 from app.dao.service_user_dao import dao_get_service_user
 from app.dao.template_folder_dao import dao_get_valid_template_folders_by_id
-from app.enums import NotificationStatus, NotificationType, ServicePermissionType, KeyType
+from app.enums import (
+    KeyType,
+    NotificationStatus,
+    NotificationType,
+    ServicePermissionType,
+)
 from app.models import (
     AnnualBilling,
     ApiKey,

app/dao/uploads_dao.py

@@ -5,13 +5,8 @@ from flask import current_app
 from sqlalchemy import String, and_, desc, func, literal, text
 
 from app import db
-from app.enums import NotificationStatus, NotificationType, JobStatus
-from app.models import (
-    Job,
-    Notification,
-    ServiceDataRetention,
-    Template,
-)
+from app.enums import JobStatus, NotificationStatus, NotificationType
+from app.models import Job, Notification, ServiceDataRetention, Template
 from app.utils import midnight_n_days_ago