Skip to content

Commit 678f8a5

Browse files
committed
Merged in [16765] from sasha@dashcare.nl:
Refs ietf-tools#2277 - Send daily reminders of overdue reviews to secretaries - Legacy-Id: 16839 Note: SVN reference [16765] has been migrated to Git commit cc64992
2 parents 1edc863 + cc64992 commit 678f8a5

File tree

6 files changed

+119
-3
lines changed

6 files changed

+119
-3
lines changed

ietf/bin/send-review-reminders

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ import datetime
2424
from ietf.review.utils import (
2525
review_assignments_needing_reviewer_reminder, email_reviewer_reminder,
2626
review_assignments_needing_secretary_reminder, email_secretary_reminder,
27-
send_unavaibility_period_ending_reminder, send_reminder_all_open_reviews)
27+
send_unavaibility_period_ending_reminder, send_reminder_all_open_reviews,
28+
send_review_reminder_overdue_assignment)
29+
2830
today = datetime.date.today()
2931

3032
for assignment in review_assignments_needing_reviewer_reminder(today):
@@ -40,6 +42,8 @@ for assignment, secretary_role in review_assignments_needing_secretary_reminder(
4042
period_end_reminders_sent = send_unavaibility_period_ending_reminder(today)
4143
print('\n'.join(period_end_reminders_sent))
4244

45+
overdue_reviews_reminders_sent = send_review_reminder_overdue_assignment(today)
46+
print('\n'.join(overdue_reviews_reminders_sent)
47+
4348
open_reviews_reminders_sent = send_reminder_all_open_reviews(today)
4449
print('\n'.join(open_reviews_reminders_sent))
45-

ietf/group/tests_review.py

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
review_assignments_needing_reviewer_reminder, email_reviewer_reminder,
2424
review_assignments_needing_secretary_reminder, email_secretary_reminder,
2525
reviewer_rotation_list,
26-
send_unavaibility_period_ending_reminder, send_reminder_all_open_reviews)
26+
send_unavaibility_period_ending_reminder, send_reminder_all_open_reviews,
27+
send_review_reminder_overdue_assignment)
2728
from ietf.name.models import ReviewResultName, ReviewRequestStateName, ReviewAssignmentStateName
2829
import ietf.group.views
2930
from ietf.utils.mail import outbox, empty_outbox
@@ -548,6 +549,26 @@ def test_send_unavaibility_period_ending_reminder(self):
548549
self.assertTrue(reviewer.person.name in log[0])
549550
self.assertTrue(review_team.acronym in log[0])
550551

552+
def test_send_review_reminder_overdue_assignment(self):
553+
today = datetime.date.today()
554+
review_req = ReviewRequestFactory(state_id='assigned', deadline=today - datetime.timedelta(5))
555+
reviewer = RoleFactory(name_id='reviewer', group=review_req.team,person__user__username='reviewer').person
556+
ReviewAssignmentFactory(review_request=review_req, state_id='assigned', assigned_on=review_req.time, reviewer=reviewer.email_set.first())
557+
secretary = RoleFactory(name_id='secr', group=review_req.team, person__user__username='reviewsecretary')
558+
559+
empty_outbox()
560+
log = send_review_reminder_overdue_assignment(today)
561+
562+
self.assertEqual(len(outbox), 1)
563+
self.assertTrue(secretary.person.email_address() in outbox[0]["To"])
564+
self.assertEqual(outbox[0]["Subject"], "1 Overdue review for team {}".format(review_req.team.acronym))
565+
message = outbox[0].get_payload(decode=True).decode("utf-8")
566+
self.assertTrue(review_req.team.acronym + ' has 1 accepted or assigned review overdue by at least 5 days.' in message)
567+
self.assertTrue('Review of {} by {}'.format(review_req.doc.name, reviewer.name) in message)
568+
self.assertEqual(len(log), 1)
569+
self.assertTrue(secretary.person.email_address() in log[0])
570+
self.assertTrue('1 overdue review' in log[0])
571+
551572
def test_send_reminder_all_open_reviews(self):
552573
review_req = ReviewRequestFactory(state_id='assigned')
553574
reviewer = RoleFactory(name_id='reviewer', group=review_req.team,person__user__username='reviewer').person
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Copyright The IETF Trust 2019, All Rights Reserved
2+
# -*- coding: utf-8 -*-
3+
4+
from __future__ import absolute_import, print_function, unicode_literals
5+
6+
from django.db import migrations
7+
8+
9+
def forward(apps, schema_editor):
10+
MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
11+
Recipient = apps.get_model('mailtrigger', 'Recipient')
12+
13+
review_reminder_overdue_assignment = MailTrigger.objects.create(
14+
slug="review_reminder_overdue_assignment",
15+
desc="Recipients for overdue review assignment reminders",
16+
)
17+
review_reminder_overdue_assignment.to.add(
18+
Recipient.objects.get(slug='group_secretaries')
19+
)
20+
21+
22+
def reverse(apps, schema_editor):
23+
MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
24+
MailTrigger.objects.filter(slug='review_reminder_overdue_assignment').delete()
25+
26+
27+
class Migration(migrations.Migration):
28+
29+
dependencies = [
30+
('mailtrigger', '0009_custom_review_complete_mailtriggers'),
31+
]
32+
33+
operations = [
34+
migrations.RunPython(forward, reverse)
35+
]

ietf/name/fixtures/names.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4019,6 +4019,17 @@
40194019
"model": "mailtrigger.mailtrigger",
40204020
"pk": "review_notify_ad"
40214021
},
4022+
{
4023+
"fields": {
4024+
"cc": [],
4025+
"desc": "Recipients for overdue review assignment reminders",
4026+
"to": [
4027+
"group_secretaries"
4028+
]
4029+
},
4030+
"model": "mailtrigger.mailtrigger",
4031+
"pk": "review_reminder_overdue_assignment"
4032+
},
40224033
{
40234034
"fields": {
40244035
"cc": [],

ietf/review/utils.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,37 @@ def send_unavaibility_period_ending_reminder(remind_date):
959959
return log
960960

961961

962+
def send_review_reminder_overdue_assignment(remind_date):
963+
min_overdue_days = 5
964+
min_deadline = remind_date + datetime.timedelta(days=min_overdue_days)
965+
teams = Group.objects.exclude(reviewteamsettings=None)
966+
log = []
967+
for team in teams:
968+
assignments = ReviewAssignment.objects.filter(
969+
state__in=("assigned", "accepted"),
970+
review_request__deadline__lte=min_deadline,
971+
review_request__team=team,
972+
)
973+
if not assignments:
974+
continue
975+
976+
(to, cc) = gather_address_lists('review_reminder_overdue_assignment', group=team)
977+
domain = Site.objects.get_current().domain
978+
subject = "{} Overdue review{} for team {}".format(
979+
len(assignments), pluralize(len(assignments)), team.acronym)
980+
981+
send_mail(None, to, None, subject, "review/review_reminder_overdue_assignment.txt", {
982+
"domain": domain,
983+
"assignments": assignments,
984+
"team": team,
985+
"min_overdue_days": min_overdue_days,
986+
}, cc=cc)
987+
log.append("Emailed reminder to {} about {} overdue reviews in {}".format(
988+
to, assignments.count(), team.acronym,
989+
))
990+
return log
991+
992+
962993
def send_reminder_all_open_reviews(remind_date):
963994
log = []
964995
# The origin date is arbitrarily chosen, to have a single reference date for "every X days"
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{% load ietf_filters %}{% autoescape off %}{% filter wordwrap:78 %}
2+
Team {{ team.acronym }} has {{ assignments|length }} accepted or assigned review{{ assignments|length|pluralize }} overdue by at least {{ min_overdue_days }} days.
3+
4+
All reviews overdue by at least {{ min_overdue_days }} days are listed below, including links to mark each of them as no response.
5+
6+
{% for assignment in assignments %}
7+
Review of {{ assignment.review_request.doc }} by {{ assignment.reviewer.person }}
8+
https://{{ domain }}{% url 'ietf.doc.views_review.mark_reviewer_assignment_no_response' name=assignment.review_request.doc.name assignment_id=assignment.pk %}
9+
10+
{% endfor %}
11+
12+
This reminder will be sent daily.
13+
14+
{% endfilter %}{% endautoescape %}

0 commit comments

Comments
 (0)