fix

tests/app/dao/test_events_dao.py

@@ -20,5 +20,5 @@ def test_create_event(notify_db_session):
     stmt = select(func.count()).select_from(Event)
     count = db.session.execute(stmt).scalar() or 0
     assert count == 1
-    event_from_db = Event.query.first()
+    event_from_db = db.session.execute(select(Event)).scalars().first()
     assert event == event_from_db

tests/app/dao/test_service_email_reply_to_dao.py

@@ -1,6 +1,7 @@
 import uuid
 
 import pytest
+from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 
 from app import db
@@ -207,7 +208,7 @@ def test_update_reply_to_email_address_set_updated_to_default(sample_service):
         is_default=True,
     )
 
-    results = ServiceEmailReplyTo.query.all()
+    results = db.session.execute(select(ServiceEmailReplyTo)).scalars().all()
     assert len(results) == 2
     for x in results:
         if x.email_address == "change_address@email.com":

tests/app/db.py

@@ -439,7 +439,7 @@ def create_service_permission(service_id, permission=ServicePermissionType.EMAIL
         permission,
     )
 
-    service_permissions = ServicePermission.query.all()
+    service_permissions = db.session.execute(select(ServicePermission)).scalars().all()
 
     return service_permissions
 

tests/app/organization/test_invite_rest.py

@@ -4,7 +4,9 @@ import uuid
 import pytest
 from flask import current_app, json
 from freezegun import freeze_time
+from sqlalchemy import select
 
+from app import db
 from app.enums import InvitedUserStatus
 from app.models import Notification
 from notifications_utils.url_safe_token import generate_token
@@ -62,7 +64,7 @@ def test_create_invited_org_user(
     assert json_resp["data"]["status"] == InvitedUserStatus.PENDING
     assert json_resp["data"]["id"]
 
-    notification = Notification.query.first()
+    notification = db.session.execute(select(Notification)).scalars().first()
 
     assert notification.reply_to_text == sample_user.email_address
 

tests/app/service/test_archived_service.py

@@ -3,6 +3,7 @@ from datetime import datetime
 
 import pytest
 from freezegun import freeze_time
+from sqlalchemy import select
 
 from app import db
 from app.dao.api_key_dao import expire_api_key
@@ -85,8 +86,12 @@ def test_deactivating_service_archives_templates(archived_service):
 def test_deactivating_service_creates_history(archived_service):
     ServiceHistory = Service.get_history_model()
     history = (
-        ServiceHistory.query.filter_by(id=archived_service.id)
-        .order_by(ServiceHistory.version.desc())
+        db.session.execute(
+            select(ServiceHistory)
+            .filter_by(id=archived_service.id)
+            .order_by(ServiceHistory.version.desc())
+        )
+        .scalars()
         .first()
     )
 

tests/app/service/test_service_data_retention_rest.py

@@ -1,6 +1,9 @@
 import json
 import uuid
 
+from sqlalchemy import select
+
+from app import db
 from app.enums import NotificationType
 from app.models import ServiceDataRetention
 from tests import create_admin_authorization_header
@@ -106,7 +109,7 @@ def test_create_service_data_retention(client, sample_service):
 
     assert response.status_code == 201
     json_resp = json.loads(response.get_data(as_text=True))["result"]
-    results = ServiceDataRetention.query.all()
+    results = db.session.execute(select(ServiceDataRetention)).scalars().all()
     assert len(results) == 1
     data_retention = results[0]
     assert json_resp == data_retention.serialize()