darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed object persistence problem

Browse Source
This commit is contained in:
venusbb
2017-10-24 14:46:10 +01:00
parent b9b0814853
commit 15e3b4171b
4 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
tests/app/billing/test_billing.py
View File

@@ -14,7 +14,8 @@ from tests.app.db import (
)
from tests import create_authorization_header
from app.dao.annual_billing_dao import dao_get_free_sms_fragment_limit_for_year, dao_create_new_annual_billing_for_year
from app.dao.annual_billing_dao import (dao_get_free_sms_fragment_limit_for_year,
dao_create_or_update_annual_billing_for_year)
from app.models import AnnualBilling
APR_2016_MONTH_START = datetime(2016, 3, 31, 23, 00, 00)
@@ -255,36 +256,6 @@ def test_transform_billing_calculates_with_different_rate_multipliers(sample_ser
})
# def test_get_annual_billing(client, sample_service):
#
# years = [2016, 2017, 2018]
# for y in years:
# data = AnnualBilling(
# free_sms_fragment_limit=250000,
# financial_year_start=y,
# service_id=sample_service.id,
# )
# dao_create_new_free_sms_fragment_limit_for_year(data)
#
# response = client.get('service/{}/annual-billing'.format(sample_service.id),
# headers=[('Content-Type', 'application/json'), create_authorization_header()])
#
# json_resp = json.loads(response.get_data(as_text=True))
#
# assert len(json_resp['data']) == 3
# assert response.status_code == 200
#
#
# def test_get_annual_billing_no_data_throws_error(client, sample_service):
#
# response = client.get('service/{}/annual-billing'.format(sample_service.id),
# headers=[('Content-Type', 'application/json'), create_authorization_header()])
#
# json_resp = json.loads(response.get_data(as_text=True))
#
# assert response.status_code == 404
def test_get_free_sms_fragment_limit(client, sample_service):
years = [2016, 2017, 2018]
sms_allowance = [1000, 2000, 3000]
@@ -296,7 +267,7 @@ def test_get_free_sms_fragment_limit(client, sample_service):
financial_year_start=y,
service_id=sample_service.id,
)
dao_create_new_annual_billing_for_year(data)
dao_create_or_update_annual_billing_for_year(data)
response = client.get('service/{}/billing/free-sms-fragment-limit?financial_year_start=2017'
.format(sample_service.id),
@@ -367,9 +338,51 @@ def test_update_free_sms_fragment_limit(client, sample_service):
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(response_get.get_data(as_text=True))
new_free_limit = dao_get_free_sms_fragment_limit_for_year(sample_service.id, 2015)
assert response.status_code == 201
assert response_get.status_code == 200
assert json_resp['data']['financial_year_start'] == 2015
assert json_resp['data']['free_sms_fragment_limit'] == 9999
def test_get_free_sms_fragment_limit_year_return_correct_data(client, sample_service):
years = [2015, 2016, 2017]
limits = [1000, 2000, 3000]
for i in range(0, len(years)):
data = AnnualBilling(
free_sms_fragment_limit=limits[i],
financial_year_start=years[i],
service_id=sample_service.id,
)
dao_create_or_update_annual_billing_for_year(data)
for i in range(0, len(years)):
response_get = client.get(
'service/{}/billing/free-sms-fragment-limit?financial_year_start={}'.format(sample_service.id, years[i]),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(response_get.get_data(as_text=True))
assert response_get.status_code == 200
assert json_resp['data']['free_sms_fragment_limit'] == limits[i]
def test_get_free_sms_fragment_limit_for_all_year(client, sample_service):
years = [2015, 2016, 2017]
limits = [1000, 2000, 3000]
for i in range(0, len(years)):
data = AnnualBilling(
free_sms_fragment_limit=limits[i],
financial_year_start=years[i],
service_id=sample_service.id,
)
dao_create_or_update_annual_billing_for_year(data)
response_get = client.get(
# Not specify a particular year to return all data for that service
'service/{}/billing/free-sms-fragment-limit'.format(sample_service.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(response_get.get_data(as_text=True))
assert response_get.status_code == 200
assert len(json_resp['data']) == 3
for i in [0, 1, 2]:
assert json_resp['data'][i]['free_sms_fragment_limit'] == limits[i]
assert json_resp['data'][i]['financial_year_start'] == years[i]

34
tests/app/dao/test_annual_billing_dao.py
View File

@@ -5,26 +5,28 @@
from app.models import AnnualBilling
from app.dao.annual_billing_dao import (
dao_create_new_annual_billing_for_year,
dao_get_free_sms_fragment_limit_for_year,
dao_update_new_free_sms_fragment_limit_for_year
dao_create_or_update_annual_billing_for_year,
dao_get_free_sms_fragment_limit_for_year
)
def test_dao_create_get_free_sms_fragment_limit(notify_db_session, sample_service):
year = 2016
data = AnnualBilling(
free_sms_fragment_limit=250000,
financial_year_start=year,
service_id=sample_service.id,
)
dao_create_new_annual_billing_for_year(data)
years = [2015, 2016, 2017]
free_limit_data = [1000, 2000, 3000]
for i in range(0, len(years)):
data = AnnualBilling(
free_sms_fragment_limit=free_limit_data[i],
financial_year_start=years[i],
service_id=sample_service.id,
)
dao_create_or_update_annual_billing_for_year(data)
free_limit = dao_get_free_sms_fragment_limit_for_year(sample_service.id, year)
for i in range(0, len(years)):
free_limit = dao_get_free_sms_fragment_limit_for_year(sample_service.id, years[i])
assert free_limit.free_sms_fragment_limit == 250000
assert free_limit.financial_year_start == year
assert free_limit.service_id == sample_service.id
assert free_limit.free_sms_fragment_limit == free_limit_data[i]
assert free_limit.financial_year_start == years[i]
assert free_limit.service_id == sample_service.id
def test_dao_update_free_sms_fragment_limit(notify_db_session, sample_service):
@@ -38,9 +40,9 @@ def test_dao_update_free_sms_fragment_limit(notify_db_session, sample_service):
service_id=sample_service.id,
)
dao_create_new_annual_billing_for_year(data)
dao_create_or_update_annual_billing_for_year(data)
data.free_sms_fragment_limit = new_limit
dao_update_new_free_sms_fragment_limit_for_year(data)
dao_create_or_update_annual_billing_for_year(data)
new_free_limit = dao_get_free_sms_fragment_limit_for_year(sample_service.id, year)
assert new_free_limit.free_sms_fragment_limit == new_limit