darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
236bbc5f28f3f9cf8f5a1918c0f461cd0a33eb58
notifications-api/tests/app/billing/test_billing.py

464 lines
20 KiB
Python
Raw Normal View History

Changes as per requested from code review Move the serialize method to the billing_schema Update variable names Improve tests Fix bug in command
2018-05-08 12:09:29 +01:00
from calendar import monthrange
This adds new endpoints to retrieve billing data from the new table: 1. Create a separate billing blueprint to house these endpoints 2. Return monthly breakdown in same format as we did before 3. Return yearly breakdown but only return {billing units, rate, notification_type}. Admin only makes use of these.
2017-08-15 17:26:10 +01:00
from datetime import datetime, timedelta
import json
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
import pytest
Remove references to monthly_billing table from api
2018-07-23 15:14:37 +01:00
from app.models import FactBilling
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
from app.dao.date_util import get_current_financial_year_start_year, get_month_start_and_end_date_in_utc
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
from app.dao.annual_billing_dao import dao_get_free_sms_fragment_limit_for_year
This adds new endpoints to retrieve billing data from the new table: 1. Create a separate billing blueprint to house these endpoints 2. Return monthly breakdown in same format as we did before 3. Return yearly breakdown but only return {billing units, rate, notification_type}. Admin only makes use of these.
2017-08-15 17:26:10 +01:00
from tests.app.db import (
create_notification,
Query the correct table for monthly billing usage: * Query `MonthlyBilling` for the monthly usage and transform response for admin
2017-08-18 13:38:53 +01:00
create_rate,
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
create_annual_billing,
Use better date function to get the first of each month. Build the json object to return for the new endpoint.
2018-04-30 16:34:40 +01:00
create_template,
create_service,
create_ft_billing
This adds new endpoints to retrieve billing data from the new table: 1. Create a separate billing blueprint to house these endpoints 2. Return monthly breakdown in same format as we did before 3. Return yearly breakdown but only return {billing units, rate, notification_type}. Admin only makes use of these.
2017-08-15 17:26:10 +01:00
)
Added an extra test
2017-11-15 09:18:39 +00:00
from app.billing.rest import update_free_sms_fragment_limit_data
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-26 17:21:41 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
from tests import create_authorization_header
This adds new endpoints to retrieve billing data from the new table: 1. Create a separate billing blueprint to house these endpoints 2. Return monthly breakdown in same format as we did before 3. Return yearly breakdown but only return {billing units, rate, notification_type}. Admin only makes use of these.
2017-08-15 17:26:10 +01:00
Query the correct table for monthly billing usage: * Query `MonthlyBilling` for the monthly usage and transform response for admin
2017-08-18 13:38:53 +01:00
APR_2016_MONTH_START = datetime(2016, 3, 31, 23, 00, 00)
APR_2016_MONTH_END = datetime(2016, 4, 30, 22, 59, 59, 99999)
This adds new endpoints to retrieve billing data from the new table: 1. Create a separate billing blueprint to house these endpoints 2. Return monthly breakdown in same format as we did before 3. Return yearly breakdown but only return {billing units, rate, notification_type}. Admin only makes use of these.
2017-08-15 17:26:10 +01:00
IN_MAY_2016 = datetime(2016, 5, 10, 23, 00, 00)
IN_JUN_2016 = datetime(2016, 6, 3, 23, 00, 00)
def _assert_dict_equals(actual, expected_dict):
Add join to LetterRates for the billing query. Fix the yearly totals to work for letters.
2017-12-18 16:46:59 +00:00
assert actual == expected_dict
This adds new endpoints to retrieve billing data from the new table: 1. Create a separate billing blueprint to house these endpoints 2. Return monthly breakdown in same format as we did before 3. Return yearly breakdown but only return {billing units, rate, notification_type}. Admin only makes use of these.
2017-08-15 17:26:10 +01:00
Added free_sms_fragment_limit model, schema, dao and Rest
2017-10-24 13:23:24 +01:00
def test_create_update_free_sms_fragment_limit_invalid_schema(client, sample_service):
response = client.post('service/{}/billing/free-sms-fragment-limit'.format(sample_service.id),
data={},
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(response.get_data(as_text=True))
assert response.status_code == 400
assert 'JSON' in json_resp['message']
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
def test_create_free_sms_fragment_limit_current_year_updates_future_years(admin_request, sample_service):
removed unused import and minor syntax
2017-11-02 17:02:00 +00:00
current_year = get_current_financial_year_start_year()
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
future_billing = create_annual_billing(sample_service.id, 1, current_year + 1)
Added free_sms_fragment_limit model, schema, dao and Rest
2017-10-24 13:23:24 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
admin_request.post(
'billing.create_or_update_free_sms_fragment_limit',
service_id=sample_service.id,
_data={'free_sms_fragment_limit': 9999},
_expected_status=201
)
Added free_sms_fragment_limit model, schema, dao and Rest
2017-10-24 13:23:24 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
current_billing = dao_get_free_sms_fragment_limit_for_year(sample_service.id, current_year)
assert future_billing.free_sms_fragment_limit == 9999
assert current_billing.financial_year_start == current_year
assert current_billing.free_sms_fragment_limit == 9999
Added free_sms_fragment_limit model, schema, dao and Rest
2017-10-24 13:23:24 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
@pytest.mark.parametrize('update_existing', [True, False])
def test_create_or_update_free_sms_fragment_limit_past_year_doenst_update_other_years(
admin_request,
sample_service,
update_existing
):
current_year = get_current_financial_year_start_year()
create_annual_billing(sample_service.id, 1, current_year)
if update_existing:
create_annual_billing(sample_service.id, 1, current_year - 1)
Added free_sms_fragment_limit model, schema, dao and Rest
2017-10-24 13:23:24 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
data = {'financial_year_start': current_year - 1, 'free_sms_fragment_limit': 9999}
admin_request.post(
'billing.create_or_update_free_sms_fragment_limit',
service_id=sample_service.id,
_data=data,
_expected_status=201)
Added free_sms_fragment_limit model, schema, dao and Rest
2017-10-24 13:23:24 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
assert dao_get_free_sms_fragment_limit_for_year(sample_service.id, current_year - 1).free_sms_fragment_limit == 9999
assert dao_get_free_sms_fragment_limit_for_year(sample_service.id, current_year).free_sms_fragment_limit == 1
fixed object persistence problem
2017-10-24 14:46:10 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
def test_create_free_sms_fragment_limit_updates_existing_year(admin_request, sample_service):
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
current_year = get_current_financial_year_start_year()
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
annual_billing = create_annual_billing(sample_service.id, 1, current_year)
removed unused import and minor syntax
2017-11-02 17:02:00 +00:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
admin_request.post(
'billing.create_or_update_free_sms_fragment_limit',
service_id=sample_service.id,
_data={'financial_year_start': current_year, 'free_sms_fragment_limit': 2},
_expected_status=201)
removed unused import and minor syntax
2017-11-02 17:02:00 +00:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
assert annual_billing.free_sms_fragment_limit == 2
remove unused codes
2017-10-25 12:50:13 +01:00
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-26 17:21:41 +01:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
def test_get_free_sms_fragment_limit_current_year_creates_new_row(client, sample_service):
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-26 17:21:41 +01:00
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
current_year = get_current_financial_year_start_year()
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
create_annual_billing(sample_service.id, 9999, current_year - 1)
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-26 17:21:41 +01:00
response_get = client.get(
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
'service/{}/billing/free-sms-fragment-limit'.format(sample_service.id),
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-26 17:21:41 +01:00
headers=[('Content-Type', 'application/json'), create_authorization_header()])
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
json_resp = json.loads(response_get.get_data(as_text=True))
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-26 17:21:41 +01:00
assert response_get.status_code == 200
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
assert json_resp['financial_year_start'] == get_current_financial_year_start_year()
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
assert json_resp['free_sms_fragment_limit'] == 9999
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
def test_get_free_sms_fragment_limit_past_year_not_exist(client, sample_service):
current_year = get_current_financial_year_start_year()
create_annual_billing(sample_service.id, 9999, current_year - 1)
create_annual_billing(sample_service.id, 10000, current_year + 1)
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
removed unused import and minor syntax
2017-11-02 17:02:00 +00:00
annual_billing = dao_get_free_sms_fragment_limit_for_year(sample_service.id, current_year - 2)
assert annual_billing is None
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
res_get = client.get(
'service/{}/billing/free-sms-fragment-limit?financial_year_start={}'
.format(sample_service.id, current_year - 2),
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
headers=[('Content-Type', 'application/json'), create_authorization_header()])
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
json_resp = json.loads(res_get.get_data(as_text=True))
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
assert res_get.status_code == 200
assert json_resp['financial_year_start'] == current_year - 1
assert json_resp['free_sms_fragment_limit'] == 9999
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
def test_get_free_sms_fragment_limit_future_year_not_exist(client, sample_service):
current_year = get_current_financial_year_start_year()
removed unused import and minor syntax
2017-11-02 17:02:00 +00:00
create_annual_billing(sample_service.id, free_sms_fragment_limit=9999, financial_year_start=current_year - 1)
create_annual_billing(sample_service.id, free_sms_fragment_limit=10000, financial_year_start=current_year + 1)
annual_billing = dao_get_free_sms_fragment_limit_for_year(sample_service.id, current_year + 2)
assert annual_billing is None
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
res_get = client.get(
'service/{}/billing/free-sms-fragment-limit?financial_year_start={}'
.format(sample_service.id, current_year + 2),
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
headers=[('Content-Type', 'application/json'), create_authorization_header()])
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
json_resp = json.loads(res_get.get_data(as_text=True))
Added logic to return past and future free_sms_limit_data that dont exist
2017-10-30 17:10:12 +00:00
- Add update dao_update_annual_billing_for_current_and_future_years - moved get_current_financial_year_start_year from service.utils to dao.date_utils - Moved logic for data persistence from rest to dao when updating records in db
2017-11-02 12:19:17 +00:00
assert res_get.status_code == 200
assert json_resp['financial_year_start'] == current_year + 2
assert json_resp['free_sms_fragment_limit'] == 10000
Added an extra test
2017-11-15 09:18:39 +00:00
def test_update_free_sms_fragment_limit_data(client, sample_service):
current_year = get_current_financial_year_start_year()
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
create_annual_billing(sample_service.id, free_sms_fragment_limit=250000, financial_year_start=current_year - 1)
Added an extra test
2017-11-15 09:18:39 +00:00
make sure POST /free-sms-fragment-limit always creates refactored billing/rest.py and annual_billing_dao.py to remove logic from the dao, and simplify the process around creating new rows. Make sure that the POST always creates (it previously wouldn't create rows for years that don't already exist). Clean up some tests that were doing too much set-up/data verification via rest calls rather than directly inserting test data in to the DB.
2017-12-06 11:03:42 +00:00
update_free_sms_fragment_limit_data(sample_service.id, 9999, current_year)
Added an extra test
2017-11-15 09:18:39 +00:00
annual_billing = dao_get_free_sms_fragment_limit_for_year(sample_service.id, current_year)
assert annual_billing.free_sms_fragment_limit == 9999
Use better date function to get the first of each month. Build the json object to return for the new endpoint.
2018-04-30 16:34:40 +01:00
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
def test_get_yearly_usage_by_monthly_from_ft_billing_populates_deltas(client, notify_db_session):
service = create_service()
sms_template = create_template(service=service, template_type="sms")
create_rate(start_date=datetime.utcnow() - timedelta(days=1), value=0.158, notification_type='sms')
create_notification(template=sms_template, status='delivered')
assert FactBilling.query.count() == 0
response = client.get('service/{}/billing/ft-monthly-usage?year=2018'.format(service.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
assert response.status_code == 200
assert len(json.loads(response.get_data(as_text=True))) == 1
fact_billing = FactBilling.query.all()
assert len(fact_billing) == 1
assert fact_billing[0].notification_type == 'sms'
Use better date function to get the first of each month. Build the json object to return for the new endpoint.
2018-04-30 16:34:40 +01:00
def test_get_yearly_usage_by_monthly_from_ft_billing(client, notify_db_session):
service = create_service()
sms_template = create_template(service=service, template_type="sms")
email_template = create_template(service=service, template_type="email")
letter_template = create_template(service=service, template_type="letter")
for month in range(1, 13):
mon = str(month).zfill(2)
Changes as per requested from code review Move the serialize method to the billing_schema Update variable names Improve tests Fix bug in command
2018-05-08 12:09:29 +01:00
for day in range(1, monthrange(2016, month)[1] + 1):
Use better date function to get the first of each month. Build the json object to return for the new endpoint.
2018-04-30 16:34:40 +01:00
d = str(day).zfill(2)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=sms_template,
notification_type='sms',
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
billable_unit=1,
Use better date function to get the first of each month. Build the json object to return for the new endpoint.
2018-04-30 16:34:40 +01:00
rate=0.162)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=email_template,
notification_type='email',
rate=0)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=letter_template,
notification_type='letter',
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
billable_unit=1,
Update ft_billing DAO functions to use postage * Updated the 'fetch_billing_data_for_day' DAO function to take postage into account * Updated the 'update_fact_billing' DAO function to insert postage for new rows. When updating rows which are identical apart from the postage, the original row will be kept. (This behaviour will change once postage is added to the primary key - at this point, upserting will add a new row.) * Also changed some fixtures / test set up functions to take postage into account
2018-09-26 11:28:59 +01:00
rate=0.33,
postage='second')
Use better date function to get the first of each month. Build the json object to return for the new endpoint.
2018-04-30 16:34:40 +01:00
response = client.get('service/{}/billing/ft-monthly-usage?year=2016'.format(service.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(response.get_data(as_text=True))
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
ft_letters = [x for x in json_resp if x['notification_type'] == 'letter']
ft_sms = [x for x in json_resp if x['notification_type'] == 'sms']
ft_email = [x for x in json_resp if x['notification_type'] == 'email']
keys = [x.keys() for x in ft_sms][0]
expected_sms_april = {"month": "April",
"notification_type": "sms",
"billing_units": 30,
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
"rate": 0.162,
"postage": "none"
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
}
expected_letter_april = {"month": "April",
"notification_type": "letter",
"billing_units": 30,
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
"rate": 0.33,
"postage": "second"
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
}
for k in keys:
assert ft_sms[0][k] == expected_sms_april[k]
assert ft_letters[0][k] == expected_letter_april[k]
assert len(ft_email) == 0
Added a new endpoint for yearly usage totals using ft_billing.
2018-05-11 16:25:16 +01:00
def set_up_yearly_data():
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
service = create_service()
sms_template = create_template(service=service, template_type="sms")
email_template = create_template(service=service, template_type="email")
letter_template = create_template(service=service, template_type="letter")
Changes as per requested from code review Move the serialize method to the billing_schema Update variable names Improve tests Fix bug in command
2018-05-08 12:09:29 +01:00
for month in range(1, 13):
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
mon = str(month).zfill(2)
Changes as per requested from code review Move the serialize method to the billing_schema Update variable names Improve tests Fix bug in command
2018-05-08 12:09:29 +01:00
for day in range(1, monthrange(2016, month)[1] + 1):
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
d = str(day).zfill(2)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=sms_template,
notification_type='sms',
rate=0.0162)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=sms_template,
notification_type='sms',
rate_multiplier=2,
rate=0.0162)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=email_template,
notification_type='email',
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
billable_unit=0,
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
rate=0)
create_ft_billing(bst_date='2016-{}-{}'.format(mon, d),
service=service,
template=letter_template,
notification_type='letter',
Update ft_billing DAO functions to use postage * Updated the 'fetch_billing_data_for_day' DAO function to take postage into account * Updated the 'update_fact_billing' DAO function to insert postage for new rows. When updating rows which are identical apart from the postage, the original row will be kept. (This behaviour will change once postage is added to the primary key - at this point, upserting will add a new row.) * Also changed some fixtures / test set up functions to take postage into account
2018-09-26 11:28:59 +01:00
rate=0.33,
postage='second')
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
start_date, end_date = get_month_start_and_end_date_in_utc(datetime(2016, int(mon), 1))
Added a new endpoint for yearly usage totals using ft_billing.
2018-05-11 16:25:16 +01:00
return service
New endpoint to get monthly billing usage from the ft_billing table. New command to compare the results of monthly billing to ft_billing.
2018-05-04 13:09:14 +01:00
Added a new endpoint for yearly usage totals using ft_billing.
2018-05-11 16:25:16 +01:00
def test_get_yearly_billing_usage_summary_from_ft_billing_returns_400_if_missing_year(client, sample_service):
response = client.get(
'/service/{}/billing/ft-yearly-usage-summary'.format(sample_service.id),
headers=[create_authorization_header()]
)
assert response.status_code == 400
assert json.loads(response.get_data(as_text=True)) == {
'message': 'No valid year provided', 'result': 'error'
}
def test_get_yearly_billing_usage_summary_from_ft_billing_returns_empty_list_if_no_billing_data(
client, sample_service
):
response = client.get(
'/service/{}/billing/ft-yearly-usage-summary?year=2016'.format(sample_service.id),
headers=[create_authorization_header()]
)
assert response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == []
def test_get_yearly_billing_usage_summary_from_ft_billing(client, notify_db_session):
service = set_up_yearly_data()
response = client.get('/service/{}/billing/ft-yearly-usage-summary?year=2016'.format(service.id),
headers=[create_authorization_header()]
)
assert response.status_code == 200
json_response = json.loads(response.get_data(as_text=True))
assert len(json_response) == 3
assert json_response[0]['notification_type'] == 'email'
assert json_response[0]['billing_units'] == 275
assert json_response[0]['rate'] == 0
assert json_response[0]['letter_total'] == 0
assert json_response[1]['notification_type'] == 'letter'
assert json_response[1]['billing_units'] == 275
assert json_response[1]['rate'] == 0.33
assert json_response[1]['letter_total'] == 90.75
assert json_response[2]['notification_type'] == 'sms'
assert json_response[2]['billing_units'] == 825
assert json_response[2]['rate'] == 0.0162
Fix test
2018-05-14 12:48:42 +01:00
assert json_response[2]['letter_total'] == 0
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
def test_get_yearly_usage_by_monthly_from_ft_billing_all_cases(client, notify_db_session):
service = set_up_data_for_all_cases()
response = client.get('service/{}/billing/ft-monthly-usage?year=2018'.format(service.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
assert response.status_code == 200
json_response = json.loads(response.get_data(as_text=True))
assert len(json_response) == 5
assert json_response[0]['month'] == 'May'
assert json_response[0]['notification_type'] == 'letter'
assert json_response[0]['rate'] == 0.33
assert json_response[0]['billing_units'] == 1
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
assert json_response[0]['postage'] == 'second'
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
assert json_response[1]['month'] == 'May'
assert json_response[1]['notification_type'] == 'letter'
assert json_response[1]['rate'] == 0.36
assert json_response[1]['billing_units'] == 1
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
assert json_response[1]['postage'] == 'second'
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
assert json_response[2]['month'] == 'May'
assert json_response[2]['notification_type'] == 'letter'
assert json_response[2]['rate'] == 0.39
assert json_response[2]['billing_units'] == 1
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
assert json_response[2]['postage'] == 'first'
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
assert json_response[3]['month'] == 'May'
assert json_response[3]['notification_type'] == 'sms'
assert json_response[3]['rate'] == 0.0150
assert json_response[3]['billing_units'] == 4
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
assert json_response[3]['postage'] == 'none'
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
assert json_response[4]['month'] == 'May'
assert json_response[4]['notification_type'] == 'sms'
assert json_response[4]['rate'] == 0.162
assert json_response[4]['billing_units'] == 5
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
assert json_response[4]['postage'] == 'none'
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
def test_get_yearly_billing_usage_summary_from_ft_billing_all_cases(client, notify_db_session):
service = set_up_data_for_all_cases()
response = client.get('/service/{}/billing/ft-yearly-usage-summary?year=2018'.format(service.id),
headers=[create_authorization_header()])
assert response.status_code == 200
json_response = json.loads(response.get_data(as_text=True))
assert len(json_response) == 6
assert json_response[0]["notification_type"] == 'email'
assert json_response[0]["billing_units"] == 1
assert json_response[0]["rate"] == 0
assert json_response[0]["letter_total"] == 0
assert json_response[1]["notification_type"] == 'letter'
assert json_response[1]["billing_units"] == 1
assert json_response[1]["rate"] == 0.33
assert json_response[1]["letter_total"] == 0.33
assert json_response[2]["notification_type"] == 'letter'
assert json_response[2]["billing_units"] == 1
assert json_response[2]["rate"] == 0.36
assert json_response[2]["letter_total"] == 0.36
assert json_response[3]["notification_type"] == 'letter'
assert json_response[3]["billing_units"] == 1
assert json_response[3]["rate"] == 0.39
assert json_response[3]["letter_total"] == 0.39
assert json_response[4]["notification_type"] == 'sms'
assert json_response[4]["billing_units"] == 4
assert json_response[4]["rate"] == 0.0150
assert json_response[4]["letter_total"] == 0
assert json_response[5]["notification_type"] == 'sms'
assert json_response[5]["billing_units"] == 5
assert json_response[5]["rate"] == 0.162
assert json_response[5]["letter_total"] == 0
def set_up_data_for_all_cases():
service = create_service()
sms_template = create_template(service=service, template_type="sms")
email_template = create_template(service=service, template_type="email")
letter_template = create_template(service=service, template_type="letter")
create_ft_billing(bst_date='2018-05-16',
notification_type='sms',
template=sms_template,
service=service,
rate_multiplier=1,
international=False,
rate=0.162,
billable_unit=1,
notifications_sent=1)
create_ft_billing(bst_date='2018-05-17',
notification_type='sms',
template=sms_template,
service=service,
rate_multiplier=2,
international=False,
rate=0.162,
billable_unit=2,
notifications_sent=1)
create_ft_billing(bst_date='2018-05-16',
notification_type='sms',
template=sms_template,
service=service,
rate_multiplier=2,
international=False,
rate=0.0150,
billable_unit=2,
notifications_sent=1)
create_ft_billing(bst_date='2018-05-16',
notification_type='email',
template=email_template,
service=service,
rate_multiplier=1,
international=False,
rate=0,
billable_unit=0,
notifications_sent=1)
create_ft_billing(bst_date='2018-05-16',
notification_type='letter',
template=letter_template,
service=service,
rate_multiplier=1,
international=False,
rate=0.33,
billable_unit=1,
Update ft_billing DAO functions to use postage * Updated the 'fetch_billing_data_for_day' DAO function to take postage into account * Updated the 'update_fact_billing' DAO function to insert postage for new rows. When updating rows which are identical apart from the postage, the original row will be kept. (This behaviour will change once postage is added to the primary key - at this point, upserting will add a new row.) * Also changed some fixtures / test set up functions to take postage into account
2018-09-26 11:28:59 +01:00
notifications_sent=1,
postage='second')
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
create_ft_billing(bst_date='2018-05-17',
notification_type='letter',
template=letter_template,
service=service,
rate_multiplier=1,
international=False,
rate=0.36,
billable_unit=2,
Update ft_billing DAO functions to use postage * Updated the 'fetch_billing_data_for_day' DAO function to take postage into account * Updated the 'update_fact_billing' DAO function to insert postage for new rows. When updating rows which are identical apart from the postage, the original row will be kept. (This behaviour will change once postage is added to the primary key - at this point, upserting will add a new row.) * Also changed some fixtures / test set up functions to take postage into account
2018-09-26 11:28:59 +01:00
notifications_sent=1,
postage='second')
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
create_ft_billing(bst_date='2018-05-18',
notification_type='letter',
template=letter_template,
service=service,
rate_multiplier=1,
international=False,
rate=0.39,
billable_unit=3,
Update ft_billing DAO functions to use postage * Updated the 'fetch_billing_data_for_day' DAO function to take postage into account * Updated the 'update_fact_billing' DAO function to insert postage for new rows. When updating rows which are identical apart from the postage, the original row will be kept. (This behaviour will change once postage is added to the primary key - at this point, upserting will add a new row.) * Also changed some fixtures / test set up functions to take postage into account
2018-09-26 11:28:59 +01:00
notifications_sent=1,
Return postage from the monthly-usage endpoint We were already returning the month, notification_type, billing_units and rate from the /monthly-usage billing endpoint. This adds in the postage too so that we can display postage details on the usage page of admin.
2018-09-27 13:58:01 +01:00
postage='first')
- Only rebuild current month for monthly_billing if today is in the current year. - Change the usage queries to a union so that billing_units is correct for all notification types. Removing the business logic from the schema. - Added tests for different fragment counts, rates and sheet counts.
2018-05-16 12:21:59 +01:00
return service
Reference in New Issue Copy Permalink