From a81c9d0ff0d35f64fb4c7e08313c550b0d7cf356 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen <53159604+heyitsmebev@users.noreply.github.com> Date: Mon, 8 Dec 2025 09:12:19 -0800 Subject: [PATCH] Remove SMS Total Message Limit from Org Dash (#3144) * Remove SMS Total Message Limit from Org Dash * update text * pytest --- app/main/views/organizations.py | 12 ++++-------- .../views/organizations/organization/index.html | 10 ++++------ .../main/views/organizations/test_organizations.py | 10 ++-------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/app/main/views/organizations.py b/app/main/views/organizations.py index 6e3496a7f..b678e7079 100644 --- a/app/main/views/organizations.py +++ b/app/main/views/organizations.py @@ -87,18 +87,14 @@ def add_organization(): return render_template("views/organizations/add-organization.html", form=form) -def get_organization_message_allowance(org_id): +def get_organization_messages_sent(org_id): try: message_usage = organizations_client.get_organization_message_usage(org_id) except Exception as e: current_app.logger.error(f"Error fetching organization message usage: {e}") message_usage = {} - return { - "messages_sent": message_usage.get("messages_sent", 0), - "messages_remaining": message_usage.get("messages_remaining", 0), - "total_message_limit": message_usage.get("total_message_limit", 0), - } + return message_usage.get("messages_sent", 0) def _handle_create_service(org_id): @@ -290,7 +286,7 @@ def organization_dashboard(org_id): elif action == "delete-service" and service_id: return _handle_delete_service(org_id, service_id) - message_allowance = get_organization_message_allowance(org_id) + messages_sent = get_organization_messages_sent(org_id) return render_template( "views/organizations/organization/index.html", @@ -305,7 +301,7 @@ def organization_dashboard(org_id): edit_service_data=edit_service_data, new_service_id=session.pop("new_service_id", None), updated_service_id=session.pop("updated_service_id", None), - **message_allowance, + messages_sent=messages_sent, ) diff --git a/app/templates/views/organizations/organization/index.html b/app/templates/views/organizations/organization/index.html index 879e9c994..9150877e6 100644 --- a/app/templates/views/organizations/organization/index.html +++ b/app/templates/views/organizations/organization/index.html @@ -9,23 +9,21 @@ {{ page_header('Organization Dashboard', size='large') }} -
+
-

Overall {{ selected_year }} Total Message Allowance

+

Overall {{ selected_year }} Messages Sent

- -
+
{{ "{:,}".format(messages_sent|default(0)) }} sent
-
diff --git a/tests/app/main/views/organizations/test_organizations.py b/tests/app/main/views/organizations/test_organizations.py index 51c9a5b8e..684828619 100644 --- a/tests/app/main/views/organizations/test_organizations.py +++ b/tests/app/main/views/organizations/test_organizations.py @@ -1521,7 +1521,7 @@ def test_organization_billing_page_not_accessible_if_not_platform_admin( ) -def test_organization_dashboard_shows_message_usage( +def test_organization_dashboard_shows_messages_sent( client_request, mock_get_organization, mocker, @@ -1531,8 +1531,6 @@ def test_organization_dashboard_shows_message_usage( "app.organizations_client.get_organization_message_usage", return_value={ "messages_sent": 1000, - "messages_remaining": 2000, - "total_message_limit": 3000, }, ) mocker.patch( @@ -1553,11 +1551,7 @@ def test_organization_dashboard_shows_message_usage( mock_message_usage.assert_called_once_with(ORGANISATION_ID) assert normalize_spaces(page.select_one("h1").text) == "Organization Dashboard" - - chart_container = page.select_one("#totalMessageChartContainer") - assert chart_container["data-messages-sent"] == "1000" - assert chart_container["data-messages-remaining"] == "2000" - assert chart_container["data-total-message-limit"] == "3000" + assert "1,000 sent" in page.text def test_organization_dashboard_shows_service_counts(