Initial refactoring of the current reviewer assignment code.

 - Legacy-Id: 16961

Author: Sasha Romijn

ietf/doc/tests_review.py

@@ -325,7 +325,7 @@ def test_assign_reviewer(self):
 
         # assign
         empty_outbox()
-        rotation_list = policy_for_team(review_req.team).reviewer_rotation_list(review_req.team)
+        rotation_list = policy_for_team(review_req.team).default_reviewer_rotation_list()
         reviewer = Email.objects.filter(role__name="reviewer", role__group=review_req.team, person=rotation_list[0]).first()
         r = self.client.post(assign_url, { "action": "assign", "reviewer": reviewer.pk })
         self.assertEqual(r.status_code, 302)

ietf/group/tests_review.py

@@ -656,7 +656,7 @@ def test_rotation_queue_update(self):
         docs = [DocumentFactory.create(type_id='draft',group=None) for i in range(4)]
         requests = [ReviewRequestFactory(team=group,doc=docs[i]) for i in range(4)]
         policy = policy_for_team(group)
-        rot_list = policy.reviewer_rotation_list(group)
+        rot_list = policy.default_reviewer_rotation_list()
 
         expected_ending_head_of_rotation = rot_list[3]
 
@@ -677,6 +677,6 @@ def test_rotation_queue_update(self):
         self.client.login(username=secretary.person.user.username,password=secretary.person.user.username+'+password')
         r = self.client.post(unassigned_url, postdict)
         self.assertEqual(r.status_code,302)
-        self.assertEqual(expected_ending_head_of_rotation, policy.reviewer_rotation_list(group)[0])
+        self.assertEqual(expected_ending_head_of_rotation, policy.default_reviewer_rotation_list()[0])
         self.assertMailboxContains(outbox, subject='Last Call assignment', text='Requested by', count=4)
 

ietf/group/views.py

@@ -1391,7 +1391,7 @@ def reviewer_overview(request, acronym, group_type=None):
 
     can_manage = can_manage_review_requests_for_team(request.user, group)
 
-    reviewers = policy_for_team(group).reviewer_rotation_list(group)
+    reviewers = policy_for_team(group).default_reviewer_rotation_list()
 
     reviewer_settings = { s.person_id: s for s in ReviewerSettings.objects.filter(team=group) }
     unavailable_periods = defaultdict(list)
@@ -1542,13 +1542,13 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
             # of the rotation queue are processed first so that the queue
             # rotates before any more assignments are processed
             reviewer_policy = policy_for_team(group)
-            head_of_rotation = reviewer_policy.reviewer_rotation_list(group)[0]
+            head_of_rotation = reviewer_policy.default_reviewer_rotation_list()[0]
             while head_of_rotation in assignments_by_person:
                 for review_req in assignments_by_person[head_of_rotation]:
                     assign_review_request_to_reviewer(request, review_req, review_req.form.cleaned_data["reviewer"],review_req.form.cleaned_data["add_skip"])
                     reqs_to_assign.remove(review_req)
                 del assignments_by_person[head_of_rotation]
-                head_of_rotation = reviewer_policy.reviewer_rotation_list(group)[0]
+                head_of_rotation = reviewer_policy.default_reviewer_rotation_list()[0]
 
             for review_req in reqs_to_assign:
                 assign_review_request_to_reviewer(request, review_req, review_req.form.cleaned_data["reviewer"],review_req.form.cleaned_data["add_skip"])
@@ -1661,7 +1661,7 @@ def should_be_replicated_in_last_call_section(r):
 
         partial_msg = render_to_string(template.path, {
             "review_assignments": review_assignments,
-            "rotation_list": policy_for_team(group).reviewer_rotation_list(group)[:10],
+            "rotation_list": policy_for_team(group).default_reviewer_rotation_list()[:10],
             "group" : group,
         })