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

Fixed ordering of the notifications test

Browse Source 
- was backwards
This commit is contained in:
Martyn Inglis
2016-03-01 14:58:27 +00:00
parent c5a993ead1
commit 6d345c1dfc
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/notifications_dao.py
View File

@@ -1,7 +1,7 @@
from flask import current_app from flask import current_app
from app import db from app import db
from app.models import Notification from app.models import Notification
from sqlalchemy import asc from sqlalchemy import desc
def dao_create_notification(notification): def dao_create_notification(notification):
@@ -20,7 +20,7 @@ def get_notification_for_job(service_id, job_id, notification_id):
def get_notifications_for_job(service_id, job_id, page=1): def get_notifications_for_job(service_id, job_id, page=1):
query = Notification.query.filter_by(service_id=service_id, job_id=job_id)\ query = Notification.query.filter_by(service_id=service_id, job_id=job_id)\
.order_by(asc(Notification.created_at))\ .order_by(desc(Notification.created_at))\
.paginate( .paginate(
page=page, page=page,
per_page=current_app.config['PAGE_SIZE'] per_page=current_app.config['PAGE_SIZE']
@@ -34,7 +34,7 @@ def get_notification(service_id, notification_id):
def get_notifications_for_service(service_id, page=1): def get_notifications_for_service(service_id, page=1):
print(service_id) print(service_id)
query = Notification.query.filter_by(service_id=service_id).order_by(asc(Notification.created_at)).paginate( query = Notification.query.filter_by(service_id=service_id).order_by(desc(Notification.created_at)).paginate(
page=page, page=page,
per_page=current_app.config['PAGE_SIZE'] per_page=current_app.config['PAGE_SIZE']
) )

9
tests/app/conftest.py
View File

@@ -261,7 +261,8 @@ def sample_notification(notify_db,
notify_db_session, notify_db_session,
service=None, service=None,
template=None, template=None,
job=None): job=None,
to_field=None):
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session) service = sample_service(notify_db, notify_db_session)
if template is None: if template is None:
@@ -270,7 +271,11 @@ def sample_notification(notify_db,
job = sample_job(notify_db, notify_db_session, service=service, template=template) job = sample_job(notify_db, notify_db_session, service=service, template=template)
notification_id = uuid.uuid4() notification_id = uuid.uuid4()
to = '+44709123456'
if to_field:
to = to_field
else:
to = '+44709123456'
data = { data = {
'id': notification_id, 'id': notification_id,

7
tests/app/notifications/test_rest.py
View File

@@ -126,10 +126,11 @@ def test_get_all_notifications_for_job_in_order(notify_api, notify_db, notify_db
with notify_api.test_client() as client: with notify_api.test_client() as client:
main_job = sample_job(notify_db, notify_db_session, service=sample_service) main_job = sample_job(notify_db, notify_db_session, service=sample_service)
another_job = sample_job(notify_db, notify_db_session, service=sample_service) another_job = sample_job(notify_db, notify_db_session, service=sample_service)
from time import sleep
notification_1 = sample_notification(notify_db, notify_db_session, job=main_job) notification_1 = sample_notification(notify_db, notify_db_session, job=main_job, to_field="1")
notification_2 = sample_notification(notify_db, notify_db_session, job=main_job) notification_2 = sample_notification(notify_db, notify_db_session, job=main_job, to_field="2")
notification_3 = sample_notification(notify_db, notify_db_session, job=main_job) notification_3 = sample_notification(notify_db, notify_db_session, job=main_job, to_field="3")
sample_notification(notify_db, notify_db_session, job=another_job) sample_notification(notify_db, notify_db_session, job=another_job)
auth_header = create_authorization_header( auth_header = create_authorization_header(