mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-11 02:23:19 -04:00
Stop passing in today_only for the get_service_statistics method.
We now only ever call it with False. To remove it from the api call will require a change in the API so will do that at another time.
This commit is contained in:
@@ -272,7 +272,6 @@ def get_notifications(service_id, message_type, status_override=None):
|
|||||||
message_type,
|
message_type,
|
||||||
service_api_client.get_service_statistics(
|
service_api_client.get_service_statistics(
|
||||||
service_id,
|
service_id,
|
||||||
today_only=False,
|
|
||||||
limit_days=service_data_retention_days
|
limit_days=service_data_retention_days
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -43,10 +43,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
|
|||||||
"""
|
"""
|
||||||
return self.get('/service/{0}'.format(service_id))
|
return self.get('/service/{0}'.format(service_id))
|
||||||
|
|
||||||
def get_service_statistics(self, service_id, today_only, limit_days=None):
|
def get_service_statistics(self, service_id, limit_days=None):
|
||||||
return self.get('/service/{0}/statistics'.format(service_id), params={
|
return self.get('/service/{0}/statistics'.format(service_id), params={'limit_days': limit_days})['data']
|
||||||
'today_only': today_only, 'limit_days': limit_days
|
|
||||||
})['data']
|
|
||||||
|
|
||||||
def get_services(self, params_dict=None):
|
def get_services(self, params_dict=None):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -37,20 +37,15 @@ def test_client_gets_service(mocker):
|
|||||||
mock_get.assert_called_once_with('/service/foo')
|
mock_get.assert_called_once_with('/service/foo')
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('today_only, limit_days', [
|
@pytest.mark.parametrize('limit_days', [None, 30])
|
||||||
(False, None),
|
def test_client_gets_service_statistics(mocker, limit_days):
|
||||||
(False, 30),
|
|
||||||
])
|
|
||||||
def test_client_gets_service_statistics(mocker, today_only, limit_days):
|
|
||||||
client = ServiceAPIClient()
|
client = ServiceAPIClient()
|
||||||
mock_get = mocker.patch.object(client, 'get', return_value={'data': {'a': 'b'}})
|
mock_get = mocker.patch.object(client, 'get', return_value={'data': {'a': 'b'}})
|
||||||
|
|
||||||
ret = client.get_service_statistics('foo', today_only, limit_days)
|
ret = client.get_service_statistics('foo', limit_days)
|
||||||
|
|
||||||
assert ret == {'a': 'b'}
|
assert ret == {'a': 'b'}
|
||||||
mock_get.assert_called_once_with('/service/foo/statistics', params={
|
mock_get.assert_called_once_with('/service/foo/statistics', params={'limit_days': limit_days})
|
||||||
'today_only': today_only, 'limit_days': limit_days
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def test_client_only_updates_allowed_attributes(mocker):
|
def test_client_only_updates_allowed_attributes(mocker):
|
||||||
|
|||||||
+1
-1
@@ -502,7 +502,7 @@ def mock_get_service(mocker, api_user_active):
|
|||||||
|
|
||||||
@pytest.fixture(scope='function')
|
@pytest.fixture(scope='function')
|
||||||
def mock_get_service_statistics(mocker, api_user_active):
|
def mock_get_service_statistics(mocker, api_user_active):
|
||||||
def _get(service_id, today_only, limit_days=None):
|
def _get(service_id, limit_days=None):
|
||||||
return {
|
return {
|
||||||
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
|
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
|
||||||
'sms': {'requested': 0, 'delivered': 0, 'failed': 0},
|
'sms': {'requested': 0, 'delivered': 0, 'failed': 0},
|
||||||
|
|||||||
Reference in New Issue
Block a user