darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-31 11:48:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename dao method to be more consistent.

Browse Source 
Fix sort.
Add one to job_row_number, rows start at 0 which would confus the user.
This commit is contained in:
Rebecca Law
2019-12-18 11:31:33 +00:00
parent aabaa4a971
commit b853c4cdf1
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,8 @@ from datetime import datetime, timedelta, date
from freezegun import freeze_time
from app.dao.returned_letters_dao import (
insert_or_update_returned_letters, get_returned_letter_summary,
insert_or_update_returned_letters,
fetch_returned_letter_summary,
fetch_returned_letters
)
from app.models import ReturnedLetter, NOTIFICATION_RETURNED_LETTER
@@ -94,7 +95,7 @@ def test_get_returned_letter_summary(sample_service):
create_returned_letter(sample_service, reported_at=now)
create_returned_letter(sample_service, reported_at=now)
results = get_returned_letter_summary(sample_service.id)
results = fetch_returned_letter_summary(sample_service.id)
assert len(results) == 1
@@ -112,7 +113,7 @@ def test_get_returned_letter_summary_orders_by_reported_at(sample_service):
create_returned_letter(sample_service, reported_at=last_month)
create_returned_letter() # returned letter for a different service
results = get_returned_letter_summary(sample_service.id)
results = fetch_returned_letter_summary(sample_service.id)
assert len(results) == 2
assert results[0].reported_at == now.date()
@@ -163,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, letter_1.job_row_number)
letter_1.created_by_id, None, sample_letter_job.original_file_name, 21)
def test_fetch_returned_letters_with_create_by_user(sample_letter_template):

5
tests/app/service/test_rest.py
View File

@@ -48,7 +48,8 @@ from tests.app.db import (
create_domain,
create_email_branding,
create_annual_billing,
create_returned_letter, create_notification_history,
create_returned_letter,
create_notification_history,
create_job
)
from tests.app.db import create_user
@@ -3443,4 +3444,4 @@ def test_get_returned_letter(admin_request, sample_letter_template):
assert response[1]['template_version'] == sample_letter_template.version
assert not response[1]['user_name']
assert response[1]['original_file_name'] == job.original_file_name
assert response[1]['job_row_number'] == 2
assert response[1]['job_row_number'] == 3