Merged in [19848] from jennifer@painless-security.com:

    Fix several review reminder problems.
Send secretary's review reminders to secretary instead of assignee. 
Send unconfirmed assignment reminders based on assignment age and CC secretaries. 
Correctly separate open review reminders by review team.
Fixes ietf-tools#3482. Fixes ietf-tools#3324.
 - Legacy-Id: 19853
Note: SVN reference [19848] has been migrated to Git commit 6df0377

Author: rjsparks

ietf/bin/send-review-reminders

@@ -23,7 +23,7 @@ django.setup()
 from ietf.review.utils import (
     review_assignments_needing_reviewer_reminder, email_reviewer_reminder,
     review_assignments_needing_secretary_reminder, email_secretary_reminder,
-    send_unavaibility_period_ending_reminder, send_reminder_all_open_reviews,
+    send_unavailability_period_ending_reminder, send_reminder_all_open_reviews,
     send_review_reminder_overdue_assignment, send_reminder_unconfirmed_assignments)
 from ietf.utils.log import log
 
@@ -38,7 +38,7 @@ for assignment, secretary_role in review_assignments_needing_secretary_reminder(
     review_req = assignment.review_request
     log("Emailed reminder to {} for review of {} in {} (req. id {})".format(secretary_role.email.address, review_req.doc_id, review_req.team.acronym, review_req.pk))
 
-period_end_reminders_sent = send_unavaibility_period_ending_reminder(today)
+period_end_reminders_sent = send_unavailability_period_ending_reminder(today)
 for msg in period_end_reminders_sent:
     log(msg)
 

ietf/group/tests_review.py

@@ -12,17 +12,10 @@
 from ietf.review.policies import get_reviewer_queue_policy
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, reload_db_objects
 from ietf.doc.models import TelechatDocEvent, LastCallDocEvent, State
-from ietf.group.models import Role
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
-from ietf.review.models import ( ReviewerSettings, UnavailablePeriod, ReviewSecretarySettings, 
-    ReviewTeamSettings, NextReviewerInTeam )
-from ietf.review.utils import (
-    suggested_review_requests_for_team,
-    review_assignments_needing_reviewer_reminder, email_reviewer_reminder,
-    review_assignments_needing_secretary_reminder, email_secretary_reminder,
-    send_unavaibility_period_ending_reminder, send_reminder_all_open_reviews,
-    send_review_reminder_overdue_assignment, send_reminder_unconfirmed_assignments)
+from ietf.review.models import ReviewerSettings, UnavailablePeriod, ReviewSecretarySettings,NextReviewerInTeam
+from ietf.review.utils import suggested_review_requests_for_team
 from ietf.name.models import ReviewResultName, ReviewRequestStateName, ReviewAssignmentStateName, \
     ReviewTypeName
 import ietf.group.views
@@ -703,199 +696,6 @@ def test_change_review_secretary_settings(self):
         self.assertEqual(settings.max_items_to_show_in_reviewer_list, 10)
         self.assertEqual(settings.days_to_show_in_reviewer_list, 365)
 
-    def test_review_reminders(self):
-        review_req = ReviewRequestFactory(state_id='assigned')
-        reviewer =  RoleFactory(name_id='reviewer',group=review_req.team,person__user__username='reviewer').person
-        assignment = ReviewAssignmentFactory(review_request=review_req, state_id='assigned', assigned_on = review_req.time, reviewer=reviewer.email_set.first())
-        RoleFactory(name_id='secr',group=review_req.team,person__user__username='reviewsecretary')
-        ReviewerSettingsFactory(team = review_req.team, person = reviewer)
-
-        remind_days = 6
-
-        reviewer_settings = ReviewerSettings.objects.get(team=review_req.team, person=reviewer)
-        reviewer_settings.remind_days_before_deadline = remind_days
-        reviewer_settings.save()
-
-        secretary = Person.objects.get(user__username="reviewsecretary")
-        secretary_role = Role.objects.get(group=review_req.team, name="secr", person=secretary)
-
-        secretary_settings = ReviewSecretarySettings(team=review_req.team, person=secretary)
-        secretary_settings.remind_days_before_deadline = remind_days
-        secretary_settings.save()
-
-        today = datetime.date.today()
-
-        review_req.reviewer = reviewer.email_set.first()
-        review_req.deadline = today + datetime.timedelta(days=remind_days)
-        review_req.save()
-
-        # reviewer
-        needing_reminders = review_assignments_needing_reviewer_reminder(today - datetime.timedelta(days=1))
-        self.assertEqual(list(needing_reminders), [])
-
-        needing_reminders = review_assignments_needing_reviewer_reminder(today)
-        self.assertEqual(list(needing_reminders), [assignment])
-
-        needing_reminders = review_assignments_needing_reviewer_reminder(today + datetime.timedelta(days=1))
-        self.assertEqual(list(needing_reminders), [])
-
-        # secretary
-        needing_reminders = review_assignments_needing_secretary_reminder(today - datetime.timedelta(days=1))
-        self.assertEqual(list(needing_reminders), [])
-
-        needing_reminders = review_assignments_needing_secretary_reminder(today)
-        self.assertEqual(list(needing_reminders), [(assignment, secretary_role)])
-
-        needing_reminders = review_assignments_needing_secretary_reminder(today + datetime.timedelta(days=1))
-        self.assertEqual(list(needing_reminders), [])
-
-        # email reviewer
-        empty_outbox()
-        email_reviewer_reminder(assignment)
-        self.assertEqual(len(outbox), 1)
-        self.assertTrue(review_req.doc.name in get_payload_text(outbox[0]))
-
-        # email secretary
-        empty_outbox()
-        email_secretary_reminder(assignment, secretary_role)
-        self.assertEqual(len(outbox), 1)
-        self.assertTrue(review_req.doc.name in get_payload_text(outbox[0]))
-
-    def test_send_unavaibility_period_ending_reminder(self):
-        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review",
-                                        list_email="reviewteam@ietf.org")
-        reviewer = RoleFactory(group=review_team, person__user__username='reviewer',
-                               person__user__email='reviewer@example.com',
-                               person__name='Some Reviewer', name_id='reviewer')
-        secretary = RoleFactory(group=review_team, person__user__username='reviewsecretary',
-                                person__user__email='reviewsecretary@example.com', name_id='secr')
-        empty_outbox()
-        today = datetime.date.today()
-        UnavailablePeriod.objects.create(
-            team=review_team,
-            person=reviewer.person,
-            start_date=today - datetime.timedelta(days=40),
-            end_date=today + datetime.timedelta(days=3),
-            availability="unavailable",
-        )
-        UnavailablePeriod.objects.create(
-            team=review_team,
-            person=reviewer.person,
-            # This object should be ignored, length is too short
-            start_date=today - datetime.timedelta(days=20),
-            end_date=today + datetime.timedelta(days=3),
-            availability="unavailable",
-        )
-        UnavailablePeriod.objects.create(
-            team=review_team,
-            person=reviewer.person,
-            start_date=today - datetime.timedelta(days=40),
-            # This object should be ignored, end date is too far away
-            end_date=today + datetime.timedelta(days=4),
-            availability="unavailable",
-        )
-        UnavailablePeriod.objects.create(
-            team=review_team,
-            person=reviewer.person,
-            # This object should be ignored, end date is too close
-            start_date=today - datetime.timedelta(days=40),
-            end_date=today + datetime.timedelta(days=2),
-            availability="unavailable",
-        )
-        log = send_unavaibility_period_ending_reminder(today)
-
-        self.assertEqual(len(outbox), 1)
-        self.assertTrue(reviewer.person.email_address() in outbox[0]["To"])
-        self.assertTrue(secretary.person.email_address() in outbox[0]["To"])
-        message = get_payload_text(outbox[0])
-        self.assertTrue(reviewer.person.name in message)
-        self.assertTrue(review_team.acronym in message)
-        self.assertEqual(len(log), 1)
-        self.assertTrue(reviewer.person.name in log[0])
-        self.assertTrue(review_team.acronym in log[0])
-
-    def test_send_review_reminder_overdue_assignment(self):
-        today = datetime.date.today()
-
-        # An assignment that's exactly on the date at which the grace period expires
-        review_req = ReviewRequestFactory(state_id='assigned', deadline=today - datetime.timedelta(5))
-        reviewer = RoleFactory(name_id='reviewer', group=review_req.team,person__user__username='reviewer').person
-        ReviewAssignmentFactory(review_request=review_req, state_id='assigned', assigned_on=review_req.time, reviewer=reviewer.email_set.first())
-        secretary = RoleFactory(name_id='secr', group=review_req.team, person__user__username='reviewsecretary')
-
-        # A assignment that is not yet overdue
-        not_overdue = today + datetime.timedelta(days=1)
-        ReviewAssignmentFactory(review_request__team=review_req.team, review_request__state_id='assigned', review_request__deadline=not_overdue, state_id='assigned', assigned_on=not_overdue, reviewer=reviewer.email_set.first())
-
-        # An assignment that is overdue but is not past the grace period
-        in_grace_period = today - datetime.timedelta(days=1)
-        ReviewAssignmentFactory(review_request__team=review_req.team, review_request__state_id='assigned', review_request__deadline=in_grace_period, state_id='assigned', assigned_on=in_grace_period, reviewer=reviewer.email_set.first())
-
-        empty_outbox()
-        log = send_review_reminder_overdue_assignment(today)
-        self.assertEqual(len(log), 1)
-
-        self.assertEqual(len(outbox), 1)
-        self.assertTrue(secretary.person.email_address() in outbox[0]["To"])
-        self.assertEqual(outbox[0]["Subject"], "1 Overdue review for team {}".format(review_req.team.acronym))
-        message = get_payload_text(outbox[0])
-        self.assertIn(review_req.team.acronym + ' has 1 accepted or assigned review overdue by at least 5 days.', message)
-        self.assertIn('Review of {} by {}'.format(review_req.doc.name, reviewer.plain_name()), message)
-        self.assertEqual(len(log), 1)
-        self.assertIn(secretary.person.email_address(), log[0])
-        self.assertIn('1 overdue review', log[0])
-        
-    def test_send_reminder_all_open_reviews(self):
-        review_req = ReviewRequestFactory(state_id='assigned')
-        reviewer = RoleFactory(name_id='reviewer', group=review_req.team,person__user__username='reviewer').person
-        ReviewAssignmentFactory(review_request=review_req, state_id='assigned', assigned_on=review_req.time, reviewer=reviewer.email_set.first())
-        RoleFactory(name_id='secr', group=review_req.team, person__user__username='reviewsecretary')
-        ReviewerSettingsFactory(team=review_req.team, person=reviewer, remind_days_open_reviews=1)
-
-        empty_outbox()
-        today = datetime.date.today()
-        log = send_reminder_all_open_reviews(today)
-
-        self.assertEqual(len(outbox), 1)
-        self.assertTrue(reviewer.email_address() in outbox[0]["To"])
-        self.assertEqual(outbox[0]["Subject"], "Reminder: you have 1 open review assignment")
-        message = get_payload_text(outbox[0])
-        self.assertTrue(review_req.team.acronym in message)
-        self.assertTrue('you have 1 open review' in message)
-        self.assertTrue(review_req.doc.name in message)
-        self.assertTrue(review_req.deadline.strftime('%Y-%m-%d') in message)
-        self.assertEqual(len(log), 1)
-        self.assertTrue(reviewer.email_address() in log[0])
-        self.assertTrue('1 open review' in log[0])
-
-    def test_send_reminder_unconfirmed_assignments(self):
-        review_req = ReviewRequestFactory(state_id='assigned')
-        reviewer = RoleFactory(name_id='reviewer', group=review_req.team, person__user__username='reviewer').person
-        ReviewAssignmentFactory(review_request=review_req, state_id='assigned', assigned_on=review_req.time, reviewer=reviewer.email_set.first())
-        RoleFactory(name_id='secr', group=review_req.team, person__user__username='reviewsecretary')
-        today = datetime.date.today()
-        
-        # By default, these reminders are disabled for all teams.
-        empty_outbox()
-        log = send_reminder_unconfirmed_assignments(today)
-        self.assertEqual(len(outbox), 0)
-        self.assertFalse(log)
-
-        ReviewTeamSettings.objects.update(remind_days_unconfirmed_assignments=1)
-
-        empty_outbox()
-        log = send_reminder_unconfirmed_assignments(today)
-        self.assertEqual(len(outbox), 1)
-        self.assertIn(reviewer.email_address(), outbox[0]["To"])
-        self.assertEqual(outbox[0]["Subject"], "Reminder: you have not responded to a review assignment")
-        message = get_payload_text(outbox[0])
-        self.assertIn(review_req.team.acronym, message)
-        self.assertIn('accept or reject the assignment on', message)
-        self.assertIn(review_req.doc.name, message)
-        self.assertEqual(len(log), 1)
-        self.assertIn(reviewer.email_address(), log[0])
-        self.assertIn('not accepted/rejected review assignment', log[0])
-
 
 class BulkAssignmentTests(TestCase):