diff --git a/smash/web/tests/test_view_notifications.py b/smash/web/tests/test_view_notifications.py index 748414e962a8127d06a00a59ae90fe5d08745efc..a11d52020a8fd8dbe4779777f3927c761cd071e8 100644 --- a/smash/web/tests/test_view_notifications.py +++ b/smash/web/tests/test_view_notifications.py @@ -8,6 +8,7 @@ from functions import create_subject from functions import create_visit from web.models import Appointment, Location from web.views.notifications import \ + get_approaching_visits_for_mail_contact, \ get_approaching_visits_for_mail_contact_count, \ get_approaching_visits_without_appointments, \ get_approaching_visits_without_appointments_count, \ @@ -283,6 +284,28 @@ class NotificationViewTests(TestCase): notification = get_approaching_visits_for_mail_contact_count(self.user) self.assertEquals(original_notification.count, notification.count) + def test_get_approaching_visits_for_mail_contact_order(self): + subject = create_subject() + + visit = create_visit(subject) + visit.datetime_begin = get_today_midnight_date() + datetime.timedelta(days=110) + visit.save() + + visit = create_visit(subject) + visit.datetime_begin = get_today_midnight_date() + datetime.timedelta(days=108) + visit.save() + + visit = create_visit(subject) + visit.datetime_begin = get_today_midnight_date() + datetime.timedelta(days=112) + visit.save() + + visits = get_approaching_visits_for_mail_contact(self.user) + self.assertEquals(3, visits.count()) + + # check sort order + self.assertTrue(visits[0].datetime_begin < visits[1].datetime_begin) + self.assertTrue(visits[1].datetime_begin < visits[2].datetime_begin) + def test_get_subjects_with_reminder_count(self): original_without_visit_notification = get_subject_with_no_visit_notifications_count(self.user) original_notification = get_subjects_with_reminder_count(self.user) diff --git a/smash/web/views/notifications.py b/smash/web/views/notifications.py index 6f22dc9d33fd482493f14aab1fb5bb6116fe51c3..e881d90873db35f1befb6d408cdc8ef1deb1c4da 100644 --- a/smash/web/views/notifications.py +++ b/smash/web/views/notifications.py @@ -177,7 +177,7 @@ def get_approaching_visits_for_mail_contact(user): is_finished=False, post_mail_sent=False, subject__default_location__in=get_filter_locations(user), - my_count=0) + my_count=0).order_by('datetime_begin') def get_exceeded_visits(user):