fix tests

app/celery/scheduled_tasks.py

@@ -1,10 +1,10 @@
 from datetime import timedelta
 
 from flask import current_app
-from sqlalchemy import between, select
+from sqlalchemy import between
 from sqlalchemy.exc import SQLAlchemyError
 
-from app import db, notify_celery, zendesk_client
+from app import notify_celery, zendesk_client
 from app.celery.tasks import (
     get_recipient_csv_and_template_and_sender_id,
     process_incomplete_jobs,
@@ -105,29 +105,15 @@ def check_job_status():
     thirty_minutes_ago = utc_now() - timedelta(minutes=30)
     thirty_five_minutes_ago = utc_now() - timedelta(minutes=35)
 
-    incomplete_in_progress_jobs = (
+    incomplete_in_progress_jobs = Job.query.filter(
-        db.session.execute(
-            select(Job).where(
         Job.job_status == JobStatus.IN_PROGRESS,
-                between(
+        between(Job.processing_started, thirty_five_minutes_ago, thirty_minutes_ago),
-                    Job.processing_started, thirty_five_minutes_ago, thirty_minutes_ago
-                ),
     )
-        )
+    incomplete_pending_jobs = Job.query.filter(
-        .scalars()
-        .all()
-    )
-    incomplete_pending_jobs = (
-        db.session.execute(
-            select(Job).where(
         Job.job_status == JobStatus.PENDING,
         Job.scheduled_for.isnot(None),
         between(Job.scheduled_for, thirty_five_minutes_ago, thirty_minutes_ago),
     )
-        )
-        .scalars()
-        .all()
-    )
 
     jobs_not_complete_after_30_minutes = (
         incomplete_in_progress_jobs.union(incomplete_pending_jobs)

tests/app/dao/test_service_inbound_api_dao.py

@@ -37,8 +37,9 @@ def test_save_service_inbound_api(sample_service):
     assert inbound_api.updated_at is None
 
     versioned = (
-        db.session.execute(select(ServiceInboundApi.get_history_model()))
+        db.session.execute(
-        .filter_by(id=inbound_api.id)
+            select(ServiceInboundApi.get_history_model()).filter_by(id=inbound_api.id)
+        )
         .scalars()
         .one()
     )
@@ -94,9 +95,9 @@ def test_update_service_inbound_api(sample_service):
 
     versioned_results = (
         db.session.execute(
-            select(ServiceInboundApi)
+            select(ServiceInboundApi.get_history_model()).filter_by(
-            .get_history_model()
+                id=saved_inbound_api.id
-            .filter_by(id=saved_inbound_api.id)
+            )
         )
         .scalars()
         .all()