Removed unused endpoint and dao methods.

This commit is contained in:
Rebecca Law
2017-08-24 16:09:48 +01:00
parent 7aaef8fc09
commit 17f62723fa
4 changed files with 2 additions and 660 deletions

View File

@@ -1970,92 +1970,6 @@ def test_update_service_does_not_call_send_notification_when_restricted_not_chan
assert not send_notification_mock.called
def test_get_yearly_billing_usage_count_returns_400_if_missing_year(client, sample_service):
response = client.get(
'/service/{}/yearly-sms-billable-units'.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_count_returns_400_if_invalid_year(client, sample_service, mocker):
redis_get_mock = mocker.patch('app.service.rest.redis_store.get_all_from_hash', return_value=None)
redis_set_mock = mocker.patch('app.service.rest.redis_store.set_hash_and_expire')
response = client.get(
'/service/{}/yearly-sms-billable-units?year=HAHAHAHAH'.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'
}
redis_get_mock.assert_called_once_with("{}-sms_billable_units".format(str(sample_service.id)))
redis_set_mock.assert_not_called()
def test_get_yearly_billing_usage_count_returns_200_if_year_provided(client, sample_service, mocker):
redis_get_mock = mocker.patch('app.service.rest.redis_store.get_all_from_hash', return_value=None)
redis_set_mock = mocker.patch('app.service.rest.redis_store.set_hash_and_expire')
start = datetime.utcnow()
end = datetime.utcnow() + timedelta(minutes=10)
mock_query = mocker.patch(
'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=(100, 200.0)
)
mock_year = mocker.patch('app.service.rest.get_financial_year', return_value=(start, end))
response = client.get(
'/service/{}/yearly-sms-billable-units?year=2016'.format(sample_service.id),
headers=[create_authorization_header()]
)
assert response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == {
'billable_sms_units': 100,
'total_cost': 200.0
}
mock_query.assert_called_once_with(start, end, sample_service.id)
mock_year.assert_called_once_with(2016)
redis_get_mock.assert_called_once_with("{}-sms_billable_units".format(str(sample_service.id)))
redis_set_mock.assert_called_once_with(
"{}-sms_billable_units".format(str(sample_service.id)),
{'billable_units': 100, 'total_cost': 200.0},
expire_in_seconds=60
)
def test_get_yearly_billing_usage_count_returns_from_cache_if_present(client, sample_service, mocker):
redis_get_mock = mocker.patch(
'app.service.rest.redis_store.get_all_from_hash',
return_value={b'total_cost': 100.0, b'billable_units': 50}
)
redis_set_mock = mocker.patch('app.service.rest.redis_store.set_hash_and_expire')
mock_query = mocker.patch(
'app.service.rest.get_total_billable_units_for_sent_sms_notifications_in_date_range', return_value=(50, 100.0)
)
start = datetime.utcnow()
end = datetime.utcnow() + timedelta(minutes=10)
mock_year = mocker.patch('app.service.rest.get_financial_year', return_value=(start, end))
response = client.get(
'/service/{}/yearly-sms-billable-units?year=2016'.format(sample_service.id),
headers=[create_authorization_header()]
)
response.get_data(as_text=True)
assert response.status_code == 200
assert json.loads(response.get_data(as_text=True)) == {
'billable_sms_units': 50,
'total_cost': 100.0
}
redis_get_mock.assert_called_once_with("{}-sms_billable_units".format(str(sample_service.id)))
mock_year.assert_not_called()
mock_query.assert_not_called()
redis_set_mock.assert_not_called()
def test_search_for_notification_by_to_field_filters_by_status(client, notify_db, notify_db_session):
create_notification = partial(
create_sample_notification,