try to fix test code

tests/app/dao/test_service_sms_sender_dao.py

@@ -1,6 +1,7 @@
 import uuid
 
 import pytest
+from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 
 from app.dao.service_sms_sender_dao import (
@@ -13,6 +14,7 @@ from app.dao.service_sms_sender_dao import (
 )
 from app.exceptions import ArchiveValidationError
 from app.models import ServiceSmsSender
+from tests.app import db
 from tests.app.db import (
     create_inbound_number,
     create_service,
@@ -97,10 +99,8 @@ def test_dao_add_sms_sender_for_service(notify_db_session):
         is_default=False,
         inbound_number_id=None,
     )
-
+    stmt = select(ServiceSmsSender).order_by(ServiceSmsSender.created_at)
-    service_sms_senders = ServiceSmsSender.query.order_by(
+    service_sms_senders = db.session.execute(stmt).scalars().all()
-        ServiceSmsSender.created_at
-    ).all()
     assert len(service_sms_senders) == 2
     assert service_sms_senders[0].sms_sender == "testing"
     assert service_sms_senders[0].is_default
@@ -116,10 +116,8 @@ def test_dao_add_sms_sender_for_service_switches_default(notify_db_session):
         is_default=True,
         inbound_number_id=None,
     )
-
+    stmt = select(ServiceSmsSender).order_by(ServiceSmsSender.created_at)
-    service_sms_senders = ServiceSmsSender.query.order_by(
+    service_sms_senders = db.session.execute(stmt).scalars().all()
-        ServiceSmsSender.created_at
-    ).all()
     assert len(service_sms_senders) == 2
     assert service_sms_senders[0].sms_sender == "testing"
     assert not service_sms_senders[0].is_default
@@ -128,7 +126,8 @@ def test_dao_add_sms_sender_for_service_switches_default(notify_db_session):
 
 def test_dao_update_service_sms_sender(notify_db_session):
     service = create_service()
-    service_sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all()
+    stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
+    service_sms_senders = db.session.execute(stmt).scalars().all()
     assert len(service_sms_senders) == 1
     sms_sender_to_update = service_sms_senders[0]
 
@@ -138,7 +137,8 @@ def test_dao_update_service_sms_sender(notify_db_session):
         is_default=True,
         sms_sender="updated",
     )
-    sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all()
+    stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
+    sms_senders = db.sessions.execute(stmt).scalars().all()
     assert len(sms_senders) == 1
     assert sms_senders[0].is_default
     assert sms_senders[0].sms_sender == "updated"
@@ -159,7 +159,8 @@ def test_dao_update_service_sms_sender_switches_default(notify_db_session):
         is_default=True,
         sms_sender="updated",
     )
-    sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all()
+    stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
+    sms_senders = db.session.execute(stmt).scalars().all()
 
     expected = {("testing", False), ("updated", True)}
     results = {(sender.sms_sender, sender.is_default) for sender in sms_senders}
@@ -190,7 +191,8 @@ def test_update_existing_sms_sender_with_inbound_number(notify_db_session):
     service = create_service()
     inbound_number = create_inbound_number(number="12345", service_id=service.id)
 
-    existing_sms_sender = ServiceSmsSender.query.filter_by(service_id=service.id).one()
+    stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
+    existing_sms_sender = db.session.execute(stmt).scalars().one()
     sms_sender = update_existing_sms_sender_with_inbound_number(
         service_sms_sender=existing_sms_sender,
         sms_sender=inbound_number.number,
@@ -206,7 +208,8 @@ def test_update_existing_sms_sender_with_inbound_number_raises_exception_if_inbo
     notify_db_session,
 ):
     service = create_service()
-    existing_sms_sender = ServiceSmsSender.query.filter_by(service_id=service.id).one()
+    stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
+    existing_sms_sender = db.session.execute(stmt).scalars().one()
     with pytest.raises(expected_exception=SQLAlchemyError):
         update_existing_sms_sender_with_inbound_number(
             service_sms_sender=existing_sms_sender,

tests/app/dao/test_users_dao.py

@@ -143,7 +143,7 @@ def test_should_not_delete_verification_codes_less_than_one_day_old(sample_user)
         sample_user, age=timedelta(hours=23, minutes=59, seconds=59), code="12345"
     )
     make_verify_code(sample_user, age=timedelta(hours=24), code="54321")
-    stmt = select(func.count(VerifyCode))
+    stmt = select(func.count(VerifyCode.id))
     assert db.session.execute(stmt).scalar() == 2
     delete_codes_older_created_more_than_a_day_ago()
     stmt = select(VerifyCode)