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

Merge pull request #3264 from alphagov/account-for-missing-scheduled_for

Browse Source 
Account for missing scheduled for field
This commit is contained in:
Chris Hill-Scott
2020-01-17 10:12:01 +00:00
committed by GitHub
parent 721134dc17 fa4fd1c896
commit 462a3b56a0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/job.py
View File

@@ -26,7 +26,6 @@ class Job(JSONModel):
'notification_count',
'job_status',
'created_by',
'scheduled_for',
}
@classmethod
@@ -45,6 +44,10 @@ class Job(JSONModel):
def scheduled(self):
return self.status == 'scheduled'
@property
def scheduled_for(self):
return self._dict.get('scheduled_for')
def _aggregate_statistics(self, *statuses):
return sum(
outcome['count'] for outcome in self._dict['statistics']

2
tests/conftest.py
View File

@@ -1732,7 +1732,6 @@ def mock_get_uploads(mocker, api_user_active):
'notification_count': 10,
'created_at': '2016-01-01 11:09:00.061258',
'statistics': [{'count': 8, 'status': 'delivered'}, {'count': 2, 'status': 'temporary-failure'}],
'scheduled_for': None,
'job_status': 'finished',
'upload_type': 'job'},
{'id': 'job_id_1',
@@ -1740,7 +1739,6 @@ def mock_get_uploads(mocker, api_user_active):
'notification_count': 1,
'created_at': '2016-01-01 11:09:00.061258',
'statistics': [{'count': 1, 'status': 'delivered'}],
'scheduled_for': None,
'job_status': 'finished',
'upload_type': 'letter'}
]