Merge pull request #918 from alphagov/catch-missing-statistics

Revert "Remove check for statistics not being on job"
This commit is contained in:
Chris Hill-Scott
2016-08-31 12:04:54 +01:00
committed by GitHub

View File

@@ -18,14 +18,15 @@ class JobApiClient(BaseAPIClient):
@staticmethod @staticmethod
def __convert_statistics(job): def __convert_statistics(job):
results = defaultdict(int) results = defaultdict(int)
for outcome in job['statistics']: if 'statistics' in job:
if outcome['status'] in ['failed', 'technical-failure', 'temporary-failure', 'permanent-failure']: for outcome in job['statistics']:
results['failed'] += outcome['count'] if outcome['status'] in ['failed', 'technical-failure', 'temporary-failure', 'permanent-failure']:
if outcome['status'] in ['sending', 'pending', 'created']: results['failed'] += outcome['count']
results['sending'] += outcome['count'] if outcome['status'] in ['sending', 'pending', 'created']:
if outcome['status'] in ['delivered']: results['sending'] += outcome['count']
results['delivered'] += outcome['count'] if outcome['status'] in ['delivered']:
results['requested'] += outcome['count'] results['delivered'] += outcome['count']
results['requested'] += outcome['count']
return results return results
def get_job(self, service_id, job_id=None, limit_days=None, status=None): def get_job(self, service_id, job_id=None, limit_days=None, status=None):