darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-28 03:39:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added new endpoints to return the yearly-usage and monthly-usage for a given financial year and service id.

Browse Source 
Since the response has changed I have created new endpoints so that the deployments for Admin are more managable.

Removed print statements from some tests.
This commit is contained in:
Rebecca Law
2017-04-27 10:00:09 +01:00
committed by Ken Tsang
parent e1e55edd9c
commit a186fc95be
7 changed files with 144 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/app/dao/test_notification_usage_dao.py
View File

@@ -1,10 +1,8 @@
import uuid
from datetime import datetime
from decimal import Decimal
from app.dao.notification_usage_dao import (get_rates_for_year, get_yearly_billing_data,
get_notification_billing_data_per_month)
get_monthly_billing_data)
from app.models import Rate
from tests.app.db import create_notification
@@ -15,11 +13,11 @@ def test_get_rates_for_year(notify_db, notify_db_session):
rates = get_rates_for_year(datetime(2016, 4, 1), datetime(2017, 3, 31), 'sms')
assert len(rates) == 1
assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2016-04-01 00:00:00"
assert rates[0].rate == Decimal("1.50")
assert rates[0].rate == 1.50
rates = get_rates_for_year(datetime(2017, 4, 1), datetime(2018, 3, 31), 'sms')
assert len(rates) == 1
assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2017-06-01 00:00:00"
assert rates[0].rate == Decimal("1.75")
assert rates[0].rate == 1.75
def test_get_yearly_billing_data(notify_db, notify_db_session, sample_template, sample_email_template):
@@ -48,9 +46,9 @@ def test_get_yearly_billing_data(notify_db, notify_db_session, sample_template,
status='sending', billable_units=6)
results = get_yearly_billing_data(sample_template.service_id, 2016)
assert len(results) == 3
assert results[0] == (3, 'sms', Decimal('1.4'), None, False, None)
assert results[1] == (12, 'sms', Decimal('1.58'), None, False, None)
assert results[2] == (2, 'email', Decimal("0"), None, False, None)
assert results[0] == (3, 'sms', None, False, None, 1.40)
assert results[1] == (12, 'sms', None, False, None, 1.58)
assert results[2] == (2, 'email', None, False, None, 0)
def test_get_yearly_billing_data_with_one_rate(notify_db, notify_db_session, sample_template):
@@ -76,8 +74,8 @@ def test_get_yearly_billing_data_with_one_rate(notify_db, notify_db_session, sam
status='sending', billable_units=7)
results = get_yearly_billing_data(sample_template.service_id, 2016)
assert len(results) == 2
assert results[0] == (15, 'sms', Decimal('1.4'), None, False, None)
assert results[1] == (0, 'email', Decimal('0'), None, False, None)
assert results[0] == (15, 'sms', None, False, None, 1.4)
assert results[1] == (0, 'email', None, False, None, 0)
def test_get_yearly_billing_data_with_no_sms_notifications(notify_db, notify_db_session, sample_email_template):
@@ -89,11 +87,11 @@ def test_get_yearly_billing_data_with_no_sms_notifications(notify_db, notify_db_
results = get_yearly_billing_data(sample_email_template.service_id, 2016)
assert len(results) == 2
assert results[0] == (0, 'sms', Decimal('0'), None, False, None)
assert results[1] == (2, 'email', Decimal('0'), None, False, None)
assert results[0] == (0, 'sms', None, False, None, 0)
assert results[1] == (2, 'email', None, False, None, 0)
def test_get_notification_billing_data_per_month(notify_db, notify_db_session, sample_template, sample_email_template):
def test_get_monthly_billing_data(notify_db, notify_db_session, sample_template, sample_email_template):
set_up_rate(notify_db, datetime(2016, 4, 1), 1.40)
# previous year
create_notification(template=sample_template, created_at=datetime(2016, 3, 31), sent_at=datetime(2016, 3, 31),
@@ -114,16 +112,16 @@ def test_get_notification_billing_data_per_month(notify_db, notify_db_session, s
# next year
create_notification(template=sample_template, created_at=datetime(2017, 3, 31, 23, 00, 00),
sent_at=datetime(2017, 3, 31), status='sending', billable_units=6)
results = get_notification_billing_data_per_month(sample_template.service_id, 2016)
results = get_monthly_billing_data(sample_template.service_id, 2016)
assert len(results) == 4
assert results[0] == ('April', 1, 'sms', Decimal('1.4'), None, False, None)
assert results[1] == ('May', 2, 'sms', Decimal('1.4'), None, False, None)
assert results[2] == ('July', 7, 'sms', Decimal('1.4'), None, False, None)
assert results[3] == ('August', 2, 'email', Decimal('0'), None, False, None)
assert results[0] == ('April', 1, 'sms', None, False, None, 1.4)
assert results[1] == ('May', 2, 'sms', None, False, None, 1.4)
assert results[2] == ('July', 7, 'sms', None, False, None, 1.4)
assert results[3] == ('August', 2, 'email', None, False, None, 0)
def test_get_notification_billing_data_per_month_with_multiple_rates(notify_db, notify_db_session, sample_template,
sample_email_template):
def test_get_monthly_billing_data_with_multiple_rates(notify_db, notify_db_session, sample_template,
sample_email_template):
set_up_rate(notify_db, datetime(2016, 4, 1), 1.40)
set_up_rate(notify_db, datetime(2016, 6, 5), 1.75)
# previous year
@@ -147,13 +145,13 @@ def test_get_notification_billing_data_per_month_with_multiple_rates(notify_db,
# next year
create_notification(template=sample_template, created_at=datetime(2017, 3, 31, 23, 00, 00),
sent_at=datetime(2017, 3, 31), status='sending', billable_units=6)
results = get_notification_billing_data_per_month(sample_template.service_id, 2016)
results = get_monthly_billing_data(sample_template.service_id, 2016)
assert len(results) == 5
assert results[0] == ('April', 1, 'sms', Decimal('1.4'), None, False, None)
assert results[1] == ('May', 2, 'sms', Decimal('1.4'), None, False, None)
assert results[2] == ('June', 3, 'sms', Decimal('1.4'), None, False, None)
assert results[3] == ('June', 4, 'sms', Decimal('1.75'), None, False, None)
assert results[4] == ('August', 2, 'email', Decimal('0'), None, False, None)
assert results[0] == ('April', 1, 'sms', None, False, None, 1.4)
assert results[1] == ('May', 2, 'sms', None, False, None, 1.4)
assert results[2] == ('June', 3, 'sms', None, False, None, 1.4)
assert results[3] == ('June', 4, 'sms', None, False, None, 1.75)
assert results[4] == ('August', 2, 'email', None, False, None, 0)
def set_up_rate(notify_db, start_date, value):

2
tests/app/job/test_rest.py
View File

@@ -205,7 +205,6 @@ def test_should_not_create_scheduled_job_more_then_24_hours_hence(notify_api, sa
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
print(json.dumps(data))
response = client.post(
path,
data=json.dumps(data),
@@ -240,7 +239,6 @@ def test_should_not_create_scheduled_job_in_the_past(notify_api, sample_template
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
print(json.dumps(data))
response = client.post(
path,
data=json.dumps(data),

68
tests/app/service/test_rest.py
View File

@@ -10,7 +10,7 @@ from freezegun import freeze_time
from app.dao.users_dao import save_model_user
from app.dao.services_dao import dao_remove_user_from_service
from app.models import User, Organisation, DVLA_ORG_LAND_REGISTRY
from app.models import User, Organisation, DVLA_ORG_LAND_REGISTRY, Rate
from tests import create_authorization_header
from tests.app.conftest import (
sample_service as create_service,
@@ -1509,3 +1509,69 @@ def test_get_template_stats_by_month_returns_error_for_incorrect_year(
)
assert response.status_code == expected_status
assert json.loads(response.get_data(as_text=True)) == expected_json
def test_get_yearly_billing_usage(client, notify_db, notify_db_session):
rate = Rate(id=uuid.uuid4(), valid_from=datetime(2016, 3, 31, 23, 00), rate=1.58, notification_type='sms')
notify_db.session.add(rate)
notification = create_sample_notification(notify_db, notify_db_session, created_at=datetime(2016, 6, 5),
sent_at=datetime(2016, 6, 5),
status='sending')
response = client.get(
'/service/{}/yearly-usage?year=2016'.format(notification.service_id),
headers=[create_authorization_header()]
)
assert response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == [{'billing_units': 1, 'notification_type': 'sms',
'phone_prefix': None, 'international': False,
'rate_multiplier': None, 'rate': 1.58},
{'billing_units': 0, 'notification_type': 'email',
'phone_prefix': None, 'international': False,
'rate_multiplier': None, 'rate': 0}]
def test_get_yearly_billing_usage_returns_400_if_missing_year(client, sample_service):
response = client.get(
'/service/{}/yearly-usage'.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_monthly_billing_usage(client, notify_db, notify_db_session):
rate = Rate(id=uuid.uuid4(), valid_from=datetime(2016, 3, 31, 23, 00), rate=1.58, notification_type='sms')
notify_db.session.add(rate)
notification = create_sample_notification(notify_db, notify_db_session, created_at=datetime(2016, 6, 5),
sent_at=datetime(2016, 6, 5),
status='sending')
create_sample_notification(notify_db, notify_db_session, created_at=datetime(2016, 7, 5),
sent_at=datetime(2016, 7, 5),
status='sending')
response = client.get(
'/service/{}/monthly-usage?year=2016'.format(notification.service_id),
headers=[create_authorization_header()]
)
assert response.status_code == 200
actual = json.loads(response.get_data(as_text=True))
assert len(actual) == 2
assert actual == [{'month': 'June', 'billing_units': 1, 'notification_type': 'sms',
'phone_prefix': None, 'international': False,
'rate_multiplier': None, 'rate': 1.58},
{'month': 'July', 'billing_units': 1, 'notification_type': 'sms',
'phone_prefix': None, 'international': False,
'rate_multiplier': None, 'rate': 1.58}]
def test_get_monthly_billing_usage_returns_400_if_missing_year(client, sample_service):
response = client.get(
'/service/{}/monthly-usage'.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'
}

1
tests/app/v2/test_errors.py
View File

@@ -88,7 +88,6 @@ def test_validation_error(app_for_test):
response = client.get(url_for('v2_under_test.raising_validation_error'))
assert response.status_code == 400
error = json.loads(response.get_data(as_text=True))
print(error)
assert len(error.keys()) == 2
assert error['status_code'] == 400
assert len(error['errors']) == 2