diff --git a/app/dao/fact_billing_dao.py b/app/dao/fact_billing_dao.py index ae5b6214e..77319ee0d 100644 --- a/app/dao/fact_billing_dao.py +++ b/app/dao/fact_billing_dao.py @@ -719,7 +719,7 @@ def fetch_usage_year_for_organization( service_with_usage = {} # initialise results for service in services: - service_with_usage[str(service.id)] = { + service_with_usage[service.id] = { "service_id": service.id, "service_name": service.name, "free_sms_limit": 0, @@ -736,7 +736,7 @@ def fetch_usage_year_for_organization( organization_id, year_start, year_end ) for usage in sms_usages: - service_with_usage[str(usage.service_id)] = { + service_with_usage[usage.service_id] = { "service_id": usage.service_id, "service_name": usage.service_name, "free_sms_limit": usage.free_sms_fragment_limit, @@ -749,7 +749,7 @@ def fetch_usage_year_for_organization( "restricted": usage.restricted, } for email_usage in email_usages: - service_with_usage[str(email_usage.service_id)][ + service_with_usage[email_usage.service_id][ "emails_sent" ] = email_usage.emails_sent diff --git a/tests/app/dao/test_fact_billing_dao.py b/tests/app/dao/test_fact_billing_dao.py index 7c8daa229..95356922e 100644 --- a/tests/app/dao/test_fact_billing_dao.py +++ b/tests/app/dao/test_fact_billing_dao.py @@ -924,7 +924,7 @@ def test_fetch_usage_year_for_organization(notify_db_session): results = fetch_usage_year_for_organization(fixtures["org_1"].id, 2019) assert len(results) == 3 - first_row = results[str(fixtures["service_1_sms_and_letter"].id)] + first_row = results[fixtures["service_1_sms_and_letter"].id] assert first_row["service_id"] == fixtures["service_1_sms_and_letter"].id assert first_row["service_name"] == fixtures["service_1_sms_and_letter"].name assert first_row["free_sms_limit"] == 10 @@ -933,7 +933,7 @@ def test_fetch_usage_year_for_organization(notify_db_session): assert first_row["sms_cost"] == 0.0 assert first_row["emails_sent"] == 0 - second_row = results[str(service_with_emails_for_org.id)] + second_row = results[service_with_emails_for_org.id] assert second_row["service_id"] == service_with_emails_for_org.id assert second_row["service_name"] == service_with_emails_for_org.name assert second_row["free_sms_limit"] == 0 @@ -942,7 +942,7 @@ def test_fetch_usage_year_for_organization(notify_db_session): assert second_row["sms_cost"] == 0 assert second_row["emails_sent"] == 1100 - third_row = results[str(fixtures["service_with_out_ft_billing_this_year"].id)] + third_row = results[fixtures["service_with_out_ft_billing_this_year"].id] assert ( third_row["service_id"] == fixtures["service_with_out_ft_billing_this_year"].id ) @@ -1025,11 +1025,11 @@ def test_fetch_usage_year_for_organization_calculates_cost_from_multiple_rates( ) assert len(results) == 1 - assert results[str(service_1.id)]["free_sms_limit"] == 3 - assert results[str(service_1.id)]["sms_remainder"] == 0 - assert results[str(service_1.id)]["sms_billable_units"] == 6 - assert results[str(service_1.id)]["chargeable_billable_sms"] == 3 - assert results[str(service_1.id)]["sms_cost"] == 8.0 + assert results[service_1.id]["free_sms_limit"] == 3 + assert results[service_1.id]["sms_remainder"] == 0 + assert results[service_1.id]["sms_billable_units"] == 6 + assert results[service_1.id]["chargeable_billable_sms"] == 3 + assert results[service_1.id]["sms_cost"] == 8.0 @freeze_time("2022-05-01 13:30") @@ -1051,11 +1051,11 @@ def test_fetch_usage_year_for_organization_when_no_usage(notify_db_session): ) assert len(results) == 1 - assert results[str(service_1.id)]["free_sms_limit"] == 3 - assert results[str(service_1.id)]["sms_remainder"] == 3 - assert results[str(service_1.id)]["sms_billable_units"] == 0 - assert results[str(service_1.id)]["chargeable_billable_sms"] == 0 - assert results[str(service_1.id)]["sms_cost"] == 0.0 + assert results[service_1.id]["free_sms_limit"] == 3 + assert results[service_1.id]["sms_remainder"] == 3 + assert results[service_1.id]["sms_billable_units"] == 0 + assert results[service_1.id]["chargeable_billable_sms"] == 0 + assert results[service_1.id]["sms_cost"] == 0.0 @freeze_time("2022-05-01 13:30") @@ -1112,9 +1112,9 @@ def test_fetch_usage_year_for_organization_only_queries_present_year(notify_db_s results = fetch_usage_year_for_organization(organization_id=org.id, year=last_year) assert len(results) == 1 - assert results[str(service_1.id)]["sms_billable_units"] == 2 - assert results[str(service_1.id)]["chargeable_billable_sms"] == 2 - assert results[str(service_1.id)]["sms_cost"] == 2.0 + assert results[service_1.id]["sms_billable_units"] == 2 + assert results[service_1.id]["chargeable_billable_sms"] == 2 + assert results[service_1.id]["sms_cost"] == 2.0 @freeze_time("2020-02-27 13:30") @@ -1165,8 +1165,8 @@ def test_fetch_usage_year_for_organization_only_returns_data_for_live_services( results = fetch_usage_year_for_organization(organization_id=org.id, year=2020) assert len(results) == 1 - assert results[str(live_service.id)]["sms_billable_units"] == 19 - assert results[str(live_service.id)]["emails_sent"] == 0 + assert results[live_service.id]["sms_billable_units"] == 19 + assert results[live_service.id]["emails_sent"] == 0 @freeze_time("2022-04-27 13:30") diff --git a/tests/app/organization/test_rest.py b/tests/app/organization/test_rest.py index 3abd3cb02..f0e0770d0 100644 --- a/tests/app/organization/test_rest.py +++ b/tests/app/organization/test_rest.py @@ -995,7 +995,7 @@ def test_get_organization_dashboard(admin_request, mocker): mock_usage = mocker.patch("app.organization.rest.fetch_usage_year_for_organization") mock_usage.return_value = { - str(service_id): { + service_id: { "service_id": service_id, "service_name": "Test Service", "active": True,