entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

lingo: fix notifications expiration for expired invoices (#23824)

This commit is contained in:
Serghei Mihai 2018-05-14 19:33:05 +02:00
parent 2dd48f00a0
commit 0b5e16ba41
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
combo/apps/lingo/models.py
View File

@ -247,8 +247,8 @@ class Regie(models.Model):
notification_reminder_id = self.get_notification_reminder_id(invoice)
if pay_limit_date < now:
# invoice is out of date
Notification.forget(user, notification_id)
Notification.forget(user, notification_reminder_id)
Notification.objects.find(user, notification_id).forget()
Notification.objects.find(user, notification_reminder_id).forget()
else:
# invoice can be paid
if pay_limit_date > now + remind_delta:

18
tests/test_notification.py
View File

@ -318,6 +318,16 @@ def test_notify_remote_items(mock_get, app, user, user2, regie):
'created': creation_date,
'pay_limit_date': pay_limit_date,
'has_pdf': False,
},
{
'id': 'O5',
'label': '050505',
'total_amount': '24',
'amount': '24',
'created': (invoice_now - timedelta(days=25)).date().isoformat(),
'pay_limit_date': (invoice_now - timedelta(days=10)).date().isoformat(),
'has_pdf': False,
}
]
},
@ -387,12 +397,12 @@ def test_notify_remote_items(mock_get, app, user, user2, regie):
assert Notification.objects.exclude(external_id__startswith='invoice-%s:reminder-' % regie.slug) \
.visible().count() == 0
assert Notification.objects.filter(external_id__startswith='invoice-%s:reminder-' % regie.slug) \
.visible().new().count() == 2
assert Notification.objects.count() == 4
.visible().new().count() == 3
assert Notification.objects.count() == 5
# url appeared on new reminder notifications
assert len([notif for notif in Notification.objects.all() if notif.url == page.get_online_url()]) == 2
assert len([notif for notif in Notification.objects.all() if notif.url == page.get_online_url()]) == 3
# be sure the are no more reminders created
regie.notify_new_remote_invoices()
assert Notification.objects.count() == 4
assert Notification.objects.count() == 5