reformat

app/dao/jobs_dao.py

@@ -19,23 +19,27 @@ from app.utils import midnight_n_days_ago
 
 
 def dao_get_notification_outcomes_for_job(service_id, job_id):
-    notification_statuses = db.session.query(
-        func.count(Notification.status).label('count'), Notification.status
-    ).filter(
-        Notification.service_id == service_id,
-        Notification.job_id == job_id
-    ).group_by(
-        Notification.status
-    ).all()
+    notification_statuses = (
+        db.session.query(
+            func.count(Notification.status).label("count"), Notification.status
+        )
+        .filter(Notification.service_id == service_id, Notification.job_id == job_id)
+        .group_by(Notification.status)
+        .all()
+    )
 
     if not notification_statuses:
-        notification_statuses = db.session.query(
-            FactNotificationStatus.notification_count.label('count'),
-            FactNotificationStatus.notification_status.label('status')
-        ).filter(
-            FactNotificationStatus.service_id == service_id,
-            FactNotificationStatus.job_id == job_id
-        ).all()
+        notification_statuses = (
+            db.session.query(
+                FactNotificationStatus.notification_count.label("count"),
+                FactNotificationStatus.notification_status.label("status"),
+            )
+            .filter(
+                FactNotificationStatus.service_id == service_id,
+                FactNotificationStatus.job_id == job_id,
+            )
+            .all()
+        )
     return notification_statuses
 
 
@@ -57,31 +61,34 @@ def dao_get_jobs_by_service_id(
 ):
     query_filter = [
         Job.service_id == service_id,
-        Job.original_file_name != current_app.config['TEST_MESSAGE_FILENAME'],
-        Job.original_file_name != current_app.config['ONE_OFF_MESSAGE_FILENAME'],
+        Job.original_file_name != current_app.config["TEST_MESSAGE_FILENAME"],
+        Job.original_file_name != current_app.config["ONE_OFF_MESSAGE_FILENAME"],
     ]
     if limit_days is not None:
         query_filter.append(Job.created_at >= midnight_n_days_ago(limit_days))
-    if statuses is not None and statuses != ['']:
-        query_filter.append(
-            Job.job_status.in_(statuses)
-        )
-    return Job.query \
-        .filter(*query_filter) \
-        .order_by(Job.processing_started.desc(), Job.created_at.desc()) \
+    if statuses is not None and statuses != [""]:
+        query_filter.append(Job.job_status.in_(statuses))
+    return (
+        Job.query.filter(*query_filter)
+        .order_by(Job.processing_started.desc(), Job.created_at.desc())
         .paginate(page=page, per_page=page_size)
+    )
 
 
 def dao_get_scheduled_job_stats(
     service_id,
 ):
-    return db.session.query(
-        func.count(Job.id),
-        func.min(Job.scheduled_for),
-    ).filter(
-        Job.service_id == service_id,
-        Job.job_status == JOB_STATUS_SCHEDULED,
-    ).one()
+    return (
+        db.session.query(
+            func.count(Job.id),
+            func.min(Job.scheduled_for),
+        )
+        .filter(
+            Job.service_id == service_id,
+            Job.job_status == JOB_STATUS_SCHEDULED,
+        )
+        .one()
+    )
 
 
 def dao_get_job_by_id(job_id):
@@ -102,14 +109,15 @@ def dao_set_scheduled_jobs_to_pending():
     the transaction so that if the task is run more than once concurrently, one task will block the other select
     from completing until it commits.
     """
-    jobs = Job.query \
-        .filter(
+    jobs = (
+        Job.query.filter(
             Job.job_status == JOB_STATUS_SCHEDULED,
-            Job.scheduled_for < datetime.utcnow()
-        ) \
-        .order_by(asc(Job.scheduled_for)) \
-        .with_for_update() \
+            Job.scheduled_for < datetime.utcnow(),
+        )
+        .order_by(asc(Job.scheduled_for))
+        .with_for_update()
         .all()
+    )
 
     for job in jobs:
         job.job_status = JOB_STATUS_PENDING
@@ -121,14 +129,12 @@ def dao_set_scheduled_jobs_to_pending():
 
 
 def dao_get_future_scheduled_job_by_id_and_service_id(job_id, service_id):
-    return Job.query \
-        .filter(
-            Job.service_id == service_id,
-            Job.id == job_id,
-            Job.job_status == JOB_STATUS_SCHEDULED,
-            Job.scheduled_for > datetime.utcnow()
-        ) \
-        .one()
+    return Job.query.filter(
+        Job.service_id == service_id,
+        Job.id == job_id,
+        Job.job_status == JOB_STATUS_SCHEDULED,
+        Job.scheduled_for > datetime.utcnow(),
+    ).one()
 
 
 def dao_create_job(job):
@@ -152,24 +158,36 @@ def dao_get_jobs_older_than_data_retention(notification_types):
     for f in flexible_data_retention:
         end_date = today - timedelta(days=f.days_of_retention)
 
-        jobs.extend(Job.query.join(Template).filter(
-            func.coalesce(Job.scheduled_for, Job.created_at) < end_date,
-            Job.archived == False,  # noqa
-            Template.template_type == f.notification_type,
-            Job.service_id == f.service_id
-        ).order_by(desc(Job.created_at)).all())
+        jobs.extend(
+            Job.query.join(Template)
+            .filter(
+                func.coalesce(Job.scheduled_for, Job.created_at) < end_date,
+                Job.archived == False,  # noqa
+                Template.template_type == f.notification_type,
+                Job.service_id == f.service_id,
+            )
+            .order_by(desc(Job.created_at))
+            .all()
+        )
 
     end_date = today - timedelta(days=7)
     for notification_type in notification_types:
         services_with_data_retention = [
-            x.service_id for x in flexible_data_retention if x.notification_type == notification_type
+            x.service_id
+            for x in flexible_data_retention
+            if x.notification_type == notification_type
         ]
-        jobs.extend(Job.query.join(Template).filter(
-            func.coalesce(Job.scheduled_for, Job.created_at) < end_date,
-            Job.archived == False,  # noqa
-            Template.template_type == notification_type,
-            Job.service_id.notin_(services_with_data_retention)
-        ).order_by(desc(Job.created_at)).all())
+        jobs.extend(
+            Job.query.join(Template)
+            .filter(
+                func.coalesce(Job.scheduled_for, Job.created_at) < end_date,
+                Job.archived == False,  # noqa
+                Template.template_type == notification_type,
+                Job.service_id.notin_(services_with_data_retention),
+            )
+            .order_by(desc(Job.created_at))
+            .all()
+        )
 
     return jobs
 
@@ -179,18 +197,16 @@ def find_jobs_with_missing_rows():
     # Using 20 minutes as a condition seems reasonable.
     ten_minutes_ago = datetime.utcnow() - timedelta(minutes=20)
     yesterday = datetime.utcnow() - timedelta(days=1)
-    jobs_with_rows_missing = db.session.query(
-        Job
-    ).filter(
-        Job.job_status == JOB_STATUS_FINISHED,
-        Job.processing_finished < ten_minutes_ago,
-        Job.processing_finished > yesterday,
-        Job.id == Notification.job_id,
-
-    ).group_by(
-        Job
-    ).having(
-        func.count(Notification.id) != Job.notification_count
+    jobs_with_rows_missing = (
+        db.session.query(Job)
+        .filter(
+            Job.job_status == JOB_STATUS_FINISHED,
+            Job.processing_finished < ten_minutes_ago,
+            Job.processing_finished > yesterday,
+            Job.id == Notification.job_id,
+        )
+        .group_by(Job)
+        .having(func.count(Notification.id) != Job.notification_count)
     )
 
     return jobs_with_rows_missing.all()
@@ -198,15 +214,20 @@ def find_jobs_with_missing_rows():
 
 def find_missing_row_for_job(job_id, job_size):
     expected_row_numbers = db.session.query(
-        func.generate_series(0, job_size - 1).label('row')
+        func.generate_series(0, job_size - 1).label("row")
     ).subquery()
 
-    query = db.session.query(
-        Notification.job_row_number,
-        expected_row_numbers.c.row.label('missing_row')
-    ).outerjoin(
-        Notification, and_(expected_row_numbers.c.row == Notification.job_row_number, Notification.job_id == job_id)
-    ).filter(
-        Notification.job_row_number == None  # noqa
+    query = (
+        db.session.query(
+            Notification.job_row_number, expected_row_numbers.c.row.label("missing_row")
+        )
+        .outerjoin(
+            Notification,
+            and_(
+                expected_row_numbers.c.row == Notification.job_row_number,
+                Notification.job_id == job_id,
+            ),
+        )
+        .filter(Notification.job_row_number == None)  # noqa
     )
     return query.all()