darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace manual SMS monthly calculations with API

Browse Source 
This starts using the sms_{cost, charged, free_allowance_used}
fields in the new API to replace the "get_free_paid_breakdown"
function we had before, which could not support multiple rates.

In order to use "get_free_paid_breakdown" the calling method had
to store a "cumulative" variable to calculate the free allowance
used so far, which is now done by the API.

To calculate the data for conftest.py, I had to start from the
bottom ("April") and manually calculate the free allowance used
to emulate the API - this is what "cumulative" used to do.
This commit is contained in:
Ben Thorner
2022-04-29 17:44:27 +01:00
parent f6dc30665f
commit d798a0d60f
4 changed files with 105 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/conftest.py
View File

@@ -2364,6 +2364,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.017,
'billing_units': 1230,
'postage': 'none',
'sms_charged': 1230,
'sms_free_allowance_used': 0,
'sms_cost': 20.91,
},
{
'month': 'February',
@@ -2371,6 +2374,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.0165,
'billing_units': 1100,
'postage': 'none',
'sms_charged': 960,
'sms_free_allowance_used': 140,
'sms_cost': 15.84,
},
{
'month': 'February',
@@ -2378,6 +2384,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.31,
'billing_units': 10,
'postage': 'second',
'sms_charged': 0,
'sms_free_allowance_used': 0,
'sms_cost': 0,
},
{
'month': 'February',
@@ -2385,6 +2394,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.33,
'billing_units': 5,
'postage': 'first',
'sms_charged': 0,
'sms_free_allowance_used': 0,
'sms_cost': 0,
},
{
'month': 'February',
@@ -2392,6 +2404,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.84,
'billing_units': 3,
'postage': 'europe',
'sms_charged': 0,
'sms_free_allowance_used': 0,
'sms_cost': 0,
},
{
'month': 'February',
@@ -2399,6 +2414,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.84,
'billing_units': 7,
'postage': 'rest-of-world',
'sms_charged': 0,
'sms_free_allowance_used': 0,
'sms_cost': 0,
},
{
'month': 'April',
@@ -2406,6 +2424,9 @@ def mock_get_monthly_usage_for_service(mocker):
'rate': 0.017,
'billing_units': 249860,
'postage': 'none',
'sms_charged': 0,
'sms_free_allowance_used': 249860,
'sms_cost': 0,
},
]