darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-05-06 00:59:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2690 from alphagov/fix-job-counts

Browse Source 
Fix job counts for older jobs
This commit is contained in:
Rebecca Law
2020-01-02 09:52:30 +00:00
committed by GitHub
parent 1d0247878f 033bcb65d2
commit b61262eb1c
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/dao/jobs_dao.py
View File

@@ -27,15 +27,15 @@ from app.models import (
ServiceDataRetention,
NOTIFICATION_CREATED,
NOTIFICATION_CANCELLED,
JOB_STATUS_CANCELLED
JOB_STATUS_CANCELLED,
FactNotificationStatus
)
@statsd(namespace="dao")
def dao_get_notification_outcomes_for_job(service_id, job_id):
return db.session.query(
func.count(Notification.status).label('count'),
Notification.status
notification_statuses = db.session.query(
func.count(Notification.status).label('count'), Notification.status
).filter(
Notification.service_id == service_id,
Notification.job_id == job_id
@@ -43,6 +43,16 @@ def dao_get_notification_outcomes_for_job(service_id, job_id):
Notification.status
).all()
if not notification_statuses:
notification_statuses = db.session.query(
FactNotificationStatus.notification_count.label('count'),
FactNotificationStatus.notification_status.label('status')
).filter(
FactNotificationStatus.service_id == service_id,
FactNotificationStatus.job_id == job_id
).all()
return notification_statuses
def dao_get_job_by_service_id_and_job_id(service_id, job_id):
return Job.query.filter_by(service_id=service_id, id=job_id).one()

31
tests/app/job/test_rest.py
View File

@@ -622,6 +622,37 @@ def test_get_job_by_id_should_return_summed_statistics(admin_request, sample_job
assert resp_json['data']['created_by']['name'] == 'Test User'
def test_get_job_by_id_with_stats_for_old_job_where_notifications_have_been_purged(admin_request, sample_template):
old_job = create_job(sample_template, notification_count=10, created_at=datetime.utcnow() - timedelta(days=9),
job_status='finished')
def __create_ft_status(job, status, count):
create_ft_notification_status(bst_date=job.created_at.date(),
notification_type='sms',
service=job.service,
job=job,
template=job.template,
key_type='normal',
notification_status=status,
count=count)
__create_ft_status(old_job, 'created', 3)
__create_ft_status(old_job, 'sending', 1)
__create_ft_status(old_job, 'failed', 3)
__create_ft_status(old_job, 'technical-failure', 1)
__create_ft_status(old_job, 'temporary-failure', 2)
resp_json = admin_request.get('job.get_job_by_service_and_job_id', service_id=old_job.service_id, job_id=old_job.id)
assert resp_json['data']['id'] == str(old_job.id)
assert {'status': 'created', 'count': 3} in resp_json['data']['statistics']
assert {'status': 'sending', 'count': 1} in resp_json['data']['statistics']
assert {'status': 'failed', 'count': 3} in resp_json['data']['statistics']
assert {'status': 'technical-failure', 'count': 1} in resp_json['data']['statistics']
assert {'status': 'temporary-failure', 'count': 2} in resp_json['data']['statistics']
assert resp_json['data']['created_by']['name'] == 'Test User'
def test_get_jobs(admin_request, sample_template):
_setup_jobs(sample_template)