darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-19 14:08:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix filter_bys

Browse Source
This commit is contained in:
Kenneth Kehl
2024-12-19 11:10:03 -08:00
parent 659169366c
commit 3388371428
35 changed files with 245 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/app/dao/test_fact_notification_status_dao.py
View File

@@ -1130,7 +1130,10 @@ def test_update_fact_notification_status_respects_gmt_bst(
stmt = (
select(func.count())
.select_from(FactNotificationStatus)
.filter_by(service_id=sample_service.id, local_date=process_day)
.where(
FactNotificationStatus.service_id == sample_service.id,
FactNotificationStatus.local_date == process_day,
)
)
result = db.session.execute(stmt)
assert result.rowcount == expected_count

10
tests/app/dao/test_organization_dao.py
View File

@@ -180,8 +180,9 @@ def test_update_organization_updates_the_service_org_type_if_org_type_is_provide
assert sample_organization.organization_type == OrganizationType.FEDERAL
assert sample_service.organization_type == OrganizationType.FEDERAL
stmt = select(Service.get_history_model()).filter_by(
id=sample_service.id, version=2
stmt = select(Service.get_history_model()).where(
Service.get_history_model().id == sample_service.id,
Service.get_history_model().version == 2,
)
assert (
db.session.execute(stmt).scalars().one().organization_type
@@ -234,8 +235,9 @@ def test_add_service_to_organization(sample_service, sample_organization):
assert sample_organization.services[0].id == sample_service.id
assert sample_service.organization_type == sample_organization.organization_type
stmt = select(Service.get_history_model()).filter_by(
id=sample_service.id, version=2
stmt = select(Service.get_history_model()).where(
Service.get_history_model().id == sample_service.id,
Service.get_history_model().version == 2,
)
assert (
db.session.execute(stmt).scalars().one().organization_type

8
tests/app/dao/test_service_callback_api_dao.py
View File

@@ -39,7 +39,9 @@ def test_save_service_callback_api(sample_service):
versioned = (
db.session.execute(
select(ServiceCallbackApi.get_history_model()).filter_by(id=callback_api.id)
select(ServiceCallbackApi.get_history_model()).where(
ServiceCallbackApi.get_history_model().id == callback_api.id
)
)
.scalars()
.one()
@@ -147,8 +149,8 @@ def test_update_service_callback_api(sample_service):
versioned_results = (
db.session.execute(
select(ServiceCallbackApi.get_history_model()).filter_by(
id=saved_callback_api.id
select(ServiceCallbackApi.get_history_model()).where(
ServiceCallbackApi.get_history_model().id == saved_callback_api.id
)
)
.scalars()

8
tests/app/dao/test_service_inbound_api_dao.py
View File

@@ -38,7 +38,9 @@ def test_save_service_inbound_api(sample_service):
versioned = (
db.session.execute(
select(ServiceInboundApi.get_history_model()).filter_by(id=inbound_api.id)
select(ServiceInboundApi.get_history_model()).where(
ServiceInboundApi.get_history_model().id == inbound_api.id
)
)
.scalars()
.one()
@@ -95,8 +97,8 @@ def test_update_service_inbound_api(sample_service):
versioned_results = (
db.session.execute(
select(ServiceInboundApi.get_history_model()).filter_by(
id=saved_inbound_api.id
select(ServiceInboundApi.get_history_model()).where(
ServiceInboundApi.get_history_model().id == saved_inbound_api.id
)
)
.scalars()

10
tests/app/dao/test_service_sms_sender_dao.py
View File

@@ -126,7 +126,7 @@ 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()
stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
stmt = select(ServiceSmsSender).where(ServiceSmsSender.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]
@@ -137,7 +137,7 @@ def test_dao_update_service_sms_sender(notify_db_session):
is_default=True,
sms_sender="updated",
)
stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
stmt = select(ServiceSmsSender).where(ServiceSmsSender.service_id == service.id)
sms_senders = db.session.execute(stmt).scalars().all()
assert len(sms_senders) == 1
assert sms_senders[0].is_default
@@ -159,7 +159,7 @@ def test_dao_update_service_sms_sender_switches_default(notify_db_session):
is_default=True,
sms_sender="updated",
)
stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
stmt = select(ServiceSmsSender).where(ServiceSmsSender.service_id == service.id)
sms_senders = db.session.execute(stmt).scalars().all()
expected = {("testing", False), ("updated", True)}
@@ -191,7 +191,7 @@ 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)
stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
stmt = select(ServiceSmsSender).where(ServiceSmsSender.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,
@@ -208,7 +208,7 @@ def test_update_existing_sms_sender_with_inbound_number_raises_exception_if_inbo
notify_db_session,
):
service = create_service()
stmt = select(ServiceSmsSender).filter_by(service_id=service.id)
stmt = select(ServiceSmsSender).where(ServiceSmsSender.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(

30
tests/app/dao/test_services_dao.py
View File

@@ -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

4
tests/app/dao/test_templates_dao.py
View File

@@ -334,9 +334,9 @@ def test_update_template_creates_a_history_record_with_current_data(
assert template_from_db.version == 2
stmt = select(TemplateHistory).filter_by(name="Sample Template")
stmt = select(TemplateHistory).where(TemplateHistory.name == "Sample Template")
assert db.session.execute(stmt).scalars().one().version == 1
stmt = select(TemplateHistory).filter_by(name="new name")
stmt = select(TemplateHistory).where(TemplateHistory.name == "new name")
assert db.session.execute(stmt).scalars().one().version == 2

8
tests/app/delivery/test_send_to_providers.py
View File

@@ -111,7 +111,9 @@ def test_should_send_personalised_template_to_correct_sms_provider_and_persist(
)
notification = (
db.session.execute(select(Notification).filter_by(id=db_notification.id))
db.session.execute(
select(Notification).where(Notification.id == db_notification.id)
)
.scalars()
.one()
)
@@ -159,7 +161,9 @@ def test_should_send_personalised_template_to_correct_email_provider_and_persist
)
notification = (
db.session.execute(select(Notification).filter_by(id=db_notification.id))
db.session.execute(
select(Notification).where(Notification.id == db_notification.id)
)
.scalars()
.one()
)

2
tests/app/service/test_api_key_endpoints.py
View File

@@ -29,7 +29,7 @@ def test_api_key_should_create_new_api_key_for_service(notify_api, sample_servic
assert "data" in json.loads(response.get_data(as_text=True))
saved_api_key = (
db.session.execute(
select(ApiKey).filter_by(service_id=sample_service.id)
select(ApiKey).where(ApiKey.service_id == sample_service.id)
)
.scalars()
.first()

2
tests/app/service/test_archived_service.py
View File

@@ -88,7 +88,7 @@ def test_deactivating_service_creates_history(archived_service):
history = (
db.session.execute(
select(ServiceHistory)
.filter_by(id=archived_service.id)
.where(ServiceHistory.id == archived_service.id)
.order_by(ServiceHistory.version.desc())
)
.scalars()

2
tests/app/service/test_suspend_resume_service.py
View File

@@ -81,7 +81,7 @@ def test_service_history_is_created(client, sample_service, action, original_sta
history = (
db.session.execute(
select(ServiceHistory)
.filter_by(id=sample_service.id)
.where(ServiceHistory.id == sample_service.id)
.order_by(ServiceHistory.version.desc())
)
.scalars()

16
tests/app/user/test_rest.py
View File

@@ -119,7 +119,7 @@ def test_post_user(admin_request, notify_db_session):
user = (
db.session.execute(
select(User).filter_by(email_address="user@digital.fake.gov")
select(User).where(User.email_address == "user@digital.fake.gov")
)
.scalars()
.first()
@@ -146,7 +146,7 @@ def test_post_user_without_auth_type(admin_request, notify_db_session):
user = (
db.session.execute(
select(User).filter_by(email_address="user@digital.fake.gov")
select(User).where(User.email_address == "user@digital.fake.gov")
)
.scalars()
.first()
@@ -494,7 +494,9 @@ def test_set_user_permissions(admin_request, sample_user, sample_service):
permission = (
db.session.execute(
select(Permission).filter_by(permission=PermissionType.MANAGE_SETTINGS)
select(Permission).where(
Permission.permission == PermissionType.MANAGE_SETTINGS
)
)
.scalars()
.first()
@@ -521,7 +523,9 @@ def test_set_user_permissions_multiple(admin_request, sample_user, sample_servic
permission = (
db.session.execute(
select(Permission).filter_by(permission=PermissionType.MANAGE_SETTINGS)
select(Permission).where(
Permission.permission == PermissionType.MANAGE_SETTINGS
)
)
.scalars()
.first()
@@ -531,7 +535,9 @@ def test_set_user_permissions_multiple(admin_request, sample_user, sample_servic
assert permission.permission == PermissionType.MANAGE_SETTINGS
permission = (
db.session.execute(
select(Permission).filter_by(permission=PermissionType.MANAGE_TEMPLATES)
select(Permission).where(
Permission.permission == PermissionType.MANAGE_TEMPLATES
)
)
.scalars()
.first()