more

tests/app/service/send_notification/test_send_one_off_notification.py

@@ -3,6 +3,7 @@ from unittest.mock import Mock
 
 import pytest
 
+from app import db
 from app.dao.service_guest_list_dao import dao_add_and_commit_guest_list_contacts
 from app.enums import (
     KeyType,
@@ -266,7 +267,7 @@ def test_send_one_off_notification_should_add_email_reply_to_text_for_notificati
     notification_id = send_one_off_notification(
         service_id=sample_email_template.service.id, post_data=data
     )
-    notification = Notification.query.get(notification_id["id"])
+    notification = db.session.get(Notification, notification_id["id"])
     celery_mock.assert_called_once_with(notification=notification, queue=None)
     assert notification.reply_to_text == reply_to_email.email_address
 
@@ -289,7 +290,7 @@ def test_send_one_off_sms_notification_should_use_sms_sender_reply_to_text(
     notification_id = send_one_off_notification(
         service_id=sample_service.id, post_data=data
     )
-    notification = Notification.query.get(notification_id["id"])
+    notification = db.session.get(Notification, notification_id["id"])
     celery_mock.assert_called_once_with(notification=notification, queue=None)
 
     assert notification.reply_to_text == "+12028675309"
@@ -313,7 +314,7 @@ def test_send_one_off_sms_notification_should_use_default_service_reply_to_text(
     notification_id = send_one_off_notification(
         service_id=sample_service.id, post_data=data
     )
-    notification = Notification.query.get(notification_id["id"])
+    notification = db.session.get(Notification, notification_id["id"])
     celery_mock.assert_called_once_with(notification=notification, queue=None)
 
     assert notification.reply_to_text == "+12028675309"

tests/app/service/test_service_guest_list.py

@@ -1,6 +1,9 @@
 import json
 import uuid
 
+from sqlalchemy import select
+
+from app import db
 from app.dao.service_guest_list_dao import dao_add_and_commit_guest_list_contacts
 from app.enums import RecipientType
 from app.models import ServiceGuestList
@@ -87,7 +90,12 @@ def test_update_guest_list_replaces_old_guest_list(client, sample_service_guest_
     )
 
     assert response.status_code == 204
-    guest_list = ServiceGuestList.query.order_by(ServiceGuestList.recipient).all()
+    guest_list = (
+        db.session.execute(select(ServiceGuestList))
+        .order_by(ServiceGuestList.recipient)
+        .scalars()
+        .all()
+    )
     assert len(guest_list) == 2
     assert guest_list[0].recipient == "+12028765309"
     assert guest_list[1].recipient == "foo@bar.com"
@@ -112,5 +120,5 @@ def test_update_guest_list_doesnt_remove_old_guest_list_if_error(
         "result": "error",
         "message": 'Invalid guest list: "" is not a valid email address or phone number',
     }
-    guest_list = ServiceGuestList.query.one()
+    guest_list = db.session.execute(select(ServiceGuestList)).scalars().one()
     assert guest_list.id == sample_service_guest_list.id

tests/app/service/test_suspend_resume_service.py

@@ -3,7 +3,9 @@ from datetime import datetime
 
 import pytest
 from freezegun import freeze_time
+from sqlalchemy import select
 
+from app import db
 from app.models import Service
 from tests import create_admin_authorization_header
 
@@ -77,8 +79,10 @@ def test_service_history_is_created(client, sample_service, action, original_sta
     )
     ServiceHistory = Service.get_history_model()
     history = (
-        ServiceHistory.query.filter_by(id=sample_service.id)
+        db.session.execute(select(ServiceHistory))
+        .filter_by(id=sample_service.id)
         .order_by(ServiceHistory.version.desc())
+        .scalars()
         .first()
     )