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

Merge pull request #2732 from alphagov/return-letter-upload-recipient

Browse Source 
Return recipient for letter uploads
This commit is contained in:
Chris Hill-Scott
2020-02-28 15:29:39 +00:00
committed by GitHub
parent 40ef0d0913 f57b5445c3
commit 5c0e65a913
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dao/uploads_dao.py
+4 -2
View File
@@ -30,7 +30,8 @@ def dao_get_uploads_by_service_id(service_id, limit_days=None, page=1, page_size
Job.scheduled_for.label("scheduled_for"),
Job.processing_started.label('processing_started'),
Job.job_status.label("status"),
literal('job').label('upload_type')
literal('job').label('upload_type'),
literal(None).label('recipient'),
).join(
Template, Job.template_id == Template.id
).filter(
@@ -58,7 +59,8 @@ def dao_get_uploads_by_service_id(service_id, limit_days=None, page=1, page_size
# letters don't have a processing_started date but we want created_at to be used for sorting
Notification.created_at.label('processing_started'),
Notification.status,
literal('letter').label('upload_type')
literal('letter').label('upload_type'),
Notification.to.label('recipient'),
).join(
Template, Notification.template_id == Template.id
).filter(