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

Refactor again

Browse Source
This commit is contained in:
Chris Hill-Scott
2020-01-09 15:54:42 +00:00
parent 2f6a8a5864
commit fda979a5f2
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/job.py
View File

@@ -45,28 +45,26 @@ class Job(JSONModel):
def scheduled(self):
return self.status == 'scheduled'
@property
def notifications_delivered(self):
def _aggregate_statistics(self, *statuses):
return sum(
outcome['count'] for outcome in self._dict['statistics']
if outcome['status'] in {'delivered', 'sent'}
if not statuses or outcome['status'] in statuses
)
@property
def notifications_delivered(self):
return self._aggregate_statistics('delivered', 'sent')
@property
def notifications_failed(self):
return sum(
outcome['count'] for outcome in self._dict['statistics']
if outcome['status'] in {
'failed', 'technical-failure', 'temporary-failure',
'permanent-failure', 'cancelled',
}
return self._aggregate_statistics(
'failed', 'technical-failure', 'temporary-failure',
'permanent-failure', 'cancelled',
)
@property
def notifications_requested(self):
return sum(
outcome['count'] for outcome in self._dict['statistics']
)
return self._aggregate_statistics()
@property
def notifications_sent(self):