Merge branch 'main' into 2199-add-pending-message-data-to-daily-and-user_daily-stats

tests/app/dao/test_services_dao.py

@@ -107,7 +107,7 @@ def _get_first_service():
 
 
 def _get_service_by_id(service_id):
-    stmt = select(Service).filter(Service.id == service_id)
+    stmt = select(Service).where(Service.id == service_id)
 
     service = db.session.execute(stmt).scalars().one()
     return service
@@ -746,9 +746,13 @@ def test_update_service_creates_a_history_record_with_current_data(notify_db_ses
     service_from_db = _get_first_service()
 
     assert service_from_db.version == 2
-    stmt = select(Service.get_history_model()).filter_by(name="service_name")
+    stmt = select(Service.get_history_model()).where(
+        Service.get_history_model().name == "service_name"
+    )
     assert db.session.execute(stmt).scalars().one().version == 1
-    stmt = select(Service.get_history_model()).filter_by(name="updated_service_name")
+    stmt = select(Service.get_history_model()).where(
+        Service.get_history_model().name == "updated_service_name"
+    )
     assert db.session.execute(stmt).scalars().one().version == 2
 
 
@@ -819,7 +823,7 @@ def test_update_service_permission_creates_a_history_record_with_current_data(
 
     stmt = (
         select(Service.get_history_model())
-        .filter_by(name="service_name")
+        .where(Service.get_history_model().name == "service_name")
         .order_by("version")
     )
     history = db.session.execute(stmt).scalars().all()
@@ -920,7 +924,9 @@ def test_add_existing_user_to_another_service_doesnot_change_old_permissions(
 
     dao_create_service(service_one, user)
     assert user.id == service_one.users[0].id
-    stmt = select(Permission).filter_by(service=service_one, user=user)
+    stmt = select(Permission).where(
+        Permission.service == service_one, Permission.user == user
+    )
     test_user_permissions = db.session.execute(stmt).all()
     assert len(test_user_permissions) == 7
 
@@ -941,10 +947,14 @@ def test_add_existing_user_to_another_service_doesnot_change_old_permissions(
     dao_create_service(service_two, other_user)
 
     assert other_user.id == service_two.users[0].id
-    stmt = select(Permission).filter_by(service=service_two, user=other_user)
+    stmt = select(Permission).where(
+        Permission.service == service_two, Permission.user == other_user
+    )
     other_user_permissions = db.session.execute(stmt).all()
     assert len(other_user_permissions) == 7
-    stmt = select(Permission).filter_by(service=service_one, user=other_user)
+    stmt = select(Permission).where(
+        Permission.service == service_one, Permission.user == other_user
+    )
     other_user_service_one_permissions = db.session.execute(stmt).all()
 
     assert len(other_user_service_one_permissions) == 0
@@ -955,11 +965,15 @@ def test_add_existing_user_to_another_service_doesnot_change_old_permissions(
         permissions.append(Permission(permission=p))
 
     dao_add_user_to_service(service_one, other_user, permissions=permissions)
-    stmt = select(Permission).filter_by(service=service_one, user=other_user)
+    stmt = select(Permission).where(
+        Permission.service == service_one, Permission.user == other_user
+    )
     other_user_service_one_permissions = db.session.execute(stmt).all()
     assert len(other_user_service_one_permissions) == 2
 
-    stmt = select(Permission).filter_by(service=service_two, user=other_user)
+    stmt = select(Permission).where(
+        Permission.service == service_two, Permission.user == other_user
+    )
     other_user_service_two_permissions = db.session.execute(stmt).all()
     assert len(other_user_service_two_permissions) == 7