darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 11:09:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3895 from alphagov/disable-statistics-check

Browse Source 
Disable the remaining messages check for uploads
This commit is contained in:
Andrew White
2021-05-22 07:34:08 +01:00
committed by GitHub
parent 658e40b6c5 00c3943222
commit 438b7457cd
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/notify_client/service_api_client.py
View File

@@ -42,9 +42,20 @@ 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, today_only, limit_days=None):
return self.get('/service/{0}/statistics'.format(service_id), params={ # FIXME: The statistics request is taking more than 30s on some accounts,
'today_only': today_only, 'limit_days': limit_days # so return an empty set of statistics for the upload check page.
})['data'] # We still do the request for when `today_only=False` so that reporting
# pages in the admin are still showing the correct values for other services.
if today_only:
return {
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
'sms': {'requested': 0, 'delivered': 0, 'failed': 0},
'letter': {'requested': 0, 'delivered': 0, 'failed': 0}
}
else:
return self.get('/service/{0}/statistics'.format(service_id), params={
'today_only': today_only, 'limit_days': limit_days
})['data']
def get_services(self, params_dict=None): def get_services(self, params_dict=None):
""" """

2
tests/app/notify_client/test_service_api_client.py
View File

@@ -38,9 +38,9 @@ def test_client_gets_service(mocker):
@pytest.mark.parametrize('today_only, limit_days', [ @pytest.mark.parametrize('today_only, limit_days', [
(True, None),
(False, None), (False, None),
(False, 30), (False, 30),
pytest.param(True, None, marks=pytest.mark.xfail(raises=AssertionError)),
]) ])
def test_client_gets_service_statistics(mocker, today_only, limit_days): def test_client_gets_service_statistics(mocker, today_only, limit_days):
client = ServiceAPIClient() client = ServiceAPIClient()