darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-16 11:20:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2936 from alphagov/show-sms-provider-traffic

Browse Source 
Show monthly usage by SMS provider on Providers page
This commit is contained in:
Katie Smith
2019-05-07 10:15:15 +01:00
committed by GitHub
parent a7d8918ee0 259a82e066
commit 9199db3400
3 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/views/providers.py
View File

@@ -22,6 +22,8 @@ def view_providers():
elif provider['notification_type'] == 'email':
domestic_email_providers.append(provider)
add_monthly_traffic(domestic_sms_providers)
return render_template(
'views/providers/providers.html',
email_providers=domestic_email_providers,
@@ -30,6 +32,14 @@ def view_providers():
)
def add_monthly_traffic(domestic_sms_providers):
total_sms_sent = sum(provider['current_month_billable_sms'] for provider in domestic_sms_providers)
for provider in domestic_sms_providers:
percentage = (provider['current_month_billable_sms'] / total_sms_sent * 100) if total_sms_sent else 0
provider['monthly_traffic'] = round(percentage)
@main.route("/provider/<provider_id>/edit", methods=['GET', 'POST'])
@login_required
@user_is_platform_admin

24
app/templates/views/providers/providers.html
View File

@@ -1,5 +1,5 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading, optional_text_field %}
{% from "components/show-more.html" import show_more %}
{% block per_page_title %}
@@ -17,7 +17,7 @@ Providers
caption="Domestic SMS providers",
caption_visible=False,
empty_message='No domestic sms providers',
field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'],
field_headings=['Provider', 'Priority', '% monthly traffic', 'Active', 'Last Updated', 'Updated By'],
field_headings_visible=True
) %}
@@ -25,6 +25,8 @@ Providers
{{ text_field(item.priority) }}
{{ text_field(item.monthly_traffic) }}
{{ text_field(item.active) }}
{% if item.updated_at %}
@@ -33,11 +35,7 @@ Providers
{{ text_field('None') }}
{% endif %}
{% if item.created_by %}
{{ text_field(item.created_by.name) }}
{% else %}
{{ text_field('None') }}
{% endif %}
{{ optional_text_field(item.created_by_name, default='None') }}
{{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
@@ -66,11 +64,7 @@ Providers
{{ text_field('None') }}
{% endif %}
{% if item.created_by %}
{{ text_field(item.created_by.name) }}
{% else %}
{{ text_field('None') }}
{% endif %}
{{ optional_text_field(item.created_by_name, default='None') }}
{{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
@@ -99,11 +93,7 @@ Providers
{{ text_field('None') }}
{% endif %}
{% if item.created_by %}
{{ text_field(item.created_by.name) }}
{% else %}
{{ text_field('None') }}
{% endif %}
{{ optional_text_field(item.created_by_name, default='None') }}
{{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}

68
tests/app/main/views/test_providers.py
View File

@@ -6,6 +6,7 @@ from bs4 import BeautifulSoup
from flask import url_for
import app
from app.main.views.providers import add_monthly_traffic
stub_providers = {
'provider_details': [
@@ -18,12 +19,9 @@ stub_providers = {
'notification_type': 'sms',
'updated_at': datetime(2017, 1, 16, 15, 20, 40).isoformat(),
'version': 1,
'created_by': {
'email_address': 'test@foo.bar',
'name': 'Test User',
'id': '7cc1dddb-bcbc-4739-8fc1-61bedde3332a'
},
'supports_international': False
'created_by_name': 'Test User',
'supports_international': False,
'current_month_billable_sms': 5020,
},
{
'id': '0bd529cd-a0fd-43e5-80ee-b95ef6b0d51f',
@@ -35,7 +33,8 @@ stub_providers = {
'updated_at': None,
'version': 1,
'created_by': None,
'supports_international': False
'supports_international': False,
'current_month_billable_sms': 6891,
},
{
'id': '6005e192-4738-4962-beec-ebd982d0b03a',
@@ -47,7 +46,8 @@ stub_providers = {
'updated_at': None,
'version': 1,
'created_by': None,
'supports_international': False
'supports_international': False,
'current_month_billable_sms': 0,
},
{
'active': True,
@@ -59,7 +59,8 @@ stub_providers = {
'updated_at': None,
'version': 1,
'created_by': None,
'supports_international': False
'supports_international': False,
'current_month_billable_sms': 0,
},
{
'id': '67c770f5-918e-4afa-a5ff-880b9beb161d',
@@ -71,7 +72,8 @@ stub_providers = {
'updated_at': None,
'version': 1,
'created_by': None,
'supports_international': True
'supports_international': True,
'current_month_billable_sms': 0,
},
{
'id': '67c770f5-918e-4afa-a5ff-880b9beb161d',
@@ -83,6 +85,7 @@ stub_providers = {
'updated_at': None,
'version': 1,
'created_by': None,
'current_month_billable_sms': 0,
}
]
}
@@ -170,10 +173,11 @@ def test_should_show_all_providers(
assert table_data[0].find_all("a")[0]['href'] == '/provider/6005e192-4738-4962-beec-ebd982d0b03f'
assert table_data[0].text.strip() == "Domestic SMS Provider"
assert table_data[1].text.strip() == "1"
assert table_data[2].text.strip() == "True"
assert table_data[3].text.strip() == "16 January at 3:20pm"
assert table_data[4].text.strip() == "Test User"
assert table_data[5].find_all("a")[0]['href'] == '/provider/6005e192-4738-4962-beec-ebd982d0b03f/edit'
assert table_data[2].text.strip() == "42"
assert table_data[3].text.strip() == "True"
assert table_data[4].text.strip() == "16 January at 3:20pm"
assert table_data[5].text.strip() == "Test User"
assert table_data[6].find_all("a")[0]['href'] == '/provider/6005e192-4738-4962-beec-ebd982d0b03f/edit'
domestic_sms_second_row = domestic_sms_table.tbody.find_all('tr')[1]
table_data = domestic_sms_second_row.find_all('td')
@@ -181,10 +185,11 @@ def test_should_show_all_providers(
assert table_data[0].find_all("a")[0]['href'] == '/provider/0bd529cd-a0fd-43e5-80ee-b95ef6b0d51f'
assert table_data[0].text.strip() == "Second Domestic SMS Provider"
assert table_data[1].text.strip() == "2"
assert table_data[2].text.strip() == "True"
assert table_data[3].text.strip() == "None"
assert table_data[2].text.strip() == "58"
assert table_data[3].text.strip() == "True"
assert table_data[4].text.strip() == "None"
assert table_data[5].find_all("a")[0]['href'] == '/provider/0bd529cd-a0fd-43e5-80ee-b95ef6b0d51f/edit'
assert table_data[5].text.strip() == "None"
assert table_data[6].find_all("a")[0]['href'] == '/provider/0bd529cd-a0fd-43e5-80ee-b95ef6b0d51f/edit'
domestic_email_first_row = domestic_email_table.tbody.find_all('tr')[0]
domestic_email_table_data = domestic_email_first_row.find_all('td')
@@ -222,6 +227,35 @@ def test_should_show_all_providers(
assert table_data[5].find_all("a")[0]['href'] == '/provider/67c770f5-918e-4afa-a5ff-880b9beb161d/edit'
def test_add_monthly_traffic():
domestic_sms_providers = [{
'identifier': 'mmg',
'current_month_billable_sms': 27,
}, {
'identifier': 'firetext',
'current_month_billable_sms': 5,
}, {
'identifier': 'loadtesting',
'current_month_billable_sms': 0,
}]
add_monthly_traffic(domestic_sms_providers)
assert domestic_sms_providers == [{
'identifier': 'mmg',
'current_month_billable_sms': 27,
'monthly_traffic': 84
}, {
'identifier': 'firetext',
'current_month_billable_sms': 5,
'monthly_traffic': 16
}, {
'identifier': 'loadtesting',
'current_month_billable_sms': 0,
'monthly_traffic': 0
}]
def test_should_show_edit_provider_form(
client,
platform_admin_user,