darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 16:01:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add email address

Browse Source 
Add uploaded_letter, the file name if the letter has been uploaded.
This commit is contained in:
Rebecca Law
2019-12-19 17:20:36 +00:00
parent b853c4cdf1
commit cd29acc2f4
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/dao/returned_letters_dao.py
View File

@@ -76,6 +76,7 @@ def fetch_returned_letters(service_id, report_date):
table.template_version,
table.created_by_id,
User.name.label('user_name'),
User.email_address,
Job.original_file_name,
(table.job_row_number + 1).label('job_row_number') # row numbers start at 0
).outerjoin(

4
app/service/rest.py
View File

@@ -970,8 +970,10 @@ def get_returned_letters(service_id):
'template_id': x.template_id,
'template_version': x.template_version,
'user_name': x.user_name,
'email_address': x.email_address,
'original_file_name': x.original_file_name,
'job_row_number': x.job_row_number
'job_row_number': x.job_row_number,
'uploaded_letter': x.client_reference if x.user_name and not x.original_file_name else None
} for x in results]
return jsonify(sorted(json_results, key=lambda i: i['created_at'], reverse=True))

9
tests/app/dao/test_returned_letters_dao.py
View File

@@ -145,10 +145,10 @@ def test_fetch_returned_letters_from_notifications_and_notification_history(samp
assert len(results) == 2
assert results[0] == (letter_2.id, returned_letter_2.reported_at, letter_2.client_reference, letter_2.created_at,
sample_letter_template.name, letter_2.template_id, letter_2.template_version,
letter_2.created_by_id, None, None, None)
None, None, None, None, None)
assert results[1] == (letter_1.id, returned_letter_1.reported_at, letter_1.client_reference, letter_1.created_at,
sample_letter_template.name, letter_1.template_id, letter_1.template_version,
letter_1.created_by_id, None, None, None)
None, None, None, None, None)
def test_fetch_returned_letters_with_jobs(sample_letter_job):
@@ -164,7 +164,7 @@ def test_fetch_returned_letters_with_jobs(sample_letter_job):
assert len(results) == 1
assert results[0] == (letter_1.id, returned_letter_1.reported_at, letter_1.client_reference, letter_1.created_at,
sample_letter_job.template.name, letter_1.template_id, letter_1.template_version,
letter_1.created_by_id, None, sample_letter_job.original_file_name, 21)
None, None, None, sample_letter_job.original_file_name, 21)
def test_fetch_returned_letters_with_create_by_user(sample_letter_template):
@@ -180,4 +180,5 @@ def test_fetch_returned_letters_with_create_by_user(sample_letter_template):
assert len(results) == 1
assert results[0] == (letter_1.id, returned_letter_1.reported_at, letter_1.client_reference, letter_1.created_at,
sample_letter_template.name, letter_1.template_id, letter_1.template_version,
letter_1.created_by_id, sample_letter_template.service.users[0].name, None, None)
letter_1.created_by_id, sample_letter_template.service.users[0].name,
sample_letter_template.service.users[0].email_address, None, None)