Account for previous reviews of ancestor documents (see [16981])

 - Legacy-Id: 17046
Note: SVN reference [16981] has been migrated to Git commit f740adc

Author: Sasha Romijn

ietf/review/policies.py

@@ -7,6 +7,7 @@
 import six
 
 from ietf.doc.models import DocumentAuthor, DocAlias
+from ietf.doc.utils import extract_complete_replaces_ancestor_mapping_for_docs
 from ietf.group.models import Role
 from ietf.person.models import Person
 import debug                            # pyflakes:ignore
@@ -261,11 +262,13 @@ def _connections_with_doc(self, doc, person_ids):
 
     def _persons_with_previous_review(self, review_req, possible_person_ids):
         """
-        Collect anyone in possible_person_ids that have reviewed the request before.
+        Collect anyone in possible_person_ids that have reviewed the document before,
+        or an ancestor document.
         Returns a set with Person IDs of anyone who has.
         """
+        doc_names = {review_req.doc.name}.union(*extract_complete_replaces_ancestor_mapping_for_docs([review_req.doc.name]).values())
         has_reviewed_previous = ReviewRequest.objects.filter(
-            doc=review_req.doc,
+            doc__name__in=doc_names,
             reviewassignment__reviewer__person__in=possible_person_ids,
             reviewassignment__state="completed",
             team=self.team,
@@ -313,30 +316,33 @@ def reviewer_settings_for(person):
         print('with skipped {}'.format([r for r in rotation_list]))
         print('without skip {}'.format([r for r in rotation_list_without_skip]))
         print('skip counts {}'.format([(r, reviewer_settings_for(r).skip_next) for r in rotation_list]))
+        # In order means: assigned to the first person in the rotation list with skip_next=0
+        # If the assignment is not in order, skip_next and NextReviewerInTeam are not modified.
         in_order_assignment = rotation_list_without_skip[0] == assignee_person
         print('in order: {}'.format(in_order_assignment))
 
         # Loop through the list until finding the first person with skip_next=0,
         # who is not the current assignee. Anyone with skip_next>0 encountered before
         # has their skip_next decreased.
         current_idx = 0
-        while in_order_assignment:
-            current_idx_person = reviewer_at_index(current_idx)
-            settings = reviewer_settings_for(current_idx_person)
-            print('evaluating {} with skip_next {}, assignee {}'.format(current_idx_person, settings.skip_next, assignee_person))
-            if settings.skip_next > 0:
-                print('dropping skip_next')
-                settings.skip_next -= 1
-                settings.save()
-            elif current_idx_person != assignee_person:
-                print('nr appointed')
-                nr = NextReviewerInTeam.objects.filter(team=self.team).first() or NextReviewerInTeam(
-                    team=self.team)
-                nr.next_reviewer = current_idx_person
-                nr.save()
-
-                break
-            current_idx += 1
+        if in_order_assignment:
+            while True:
+                current_idx_person = reviewer_at_index(current_idx)
+                settings = reviewer_settings_for(current_idx_person)
+                print('evaluating {} with skip_next {}, assignee {}'.format(current_idx_person, settings.skip_next, assignee_person))
+                if settings.skip_next > 0:
+                    print('dropping skip_next')
+                    settings.skip_next -= 1
+                    settings.save()
+                elif current_idx_person != assignee_person:
+                    print('nr appointed')
+                    nr = NextReviewerInTeam.objects.filter(team=self.team).first() or NextReviewerInTeam(
+                        team=self.team)
+                    nr.next_reviewer = current_idx_person
+                    nr.save()
+    
+                    break
+                current_idx += 1
 
         if add_skip:
             print('raising skip count for assignee')

ietf/review/test_policies.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 
-from ietf.doc.factories import WgDraftFactory
+from ietf.doc.factories import WgDraftFactory, IndividualDraftFactory
 from ietf.group.factories import ReviewTeamFactory
 from ietf.group.models import Group, Role
 from ietf.person.fields import PersonEmailChoiceField
@@ -177,15 +177,18 @@ def test_determine_ranking(self):
         # This reviewer should be ignored because it is not in the rotation list.
         create_person(team, "reviewer", name="Test Reviewer-out-of-rotation", username="testreviewer-out-of-rotation")
 
-        # Trigger author check, AD check and group check
-        doc = WgDraftFactory(group__acronym='mars', rev='01', authors=[reviewer_low], ad=reviewer_low, shepherd=reviewer_low.email())
+        # Create a document with ancestors, that also triggers author check, AD check and group check
+        doc_individual = IndividualDraftFactory()
+        doc_wg = WgDraftFactory(relations=[('replaces', doc_individual)])
+        doc_middle_wg = WgDraftFactory(relations=[('replaces', doc_wg)])
+        doc = WgDraftFactory(group__acronym='mars', rev='01', authors=[reviewer_low], ad=reviewer_low, shepherd=reviewer_low.email(), relations=[('replaces', doc_middle_wg)])
         Role.objects.create(group=doc.group, person=reviewer_low, email=reviewer_low.email(), name_id='advisor')
 
         review_req = ReviewRequestFactory(doc=doc, team=team, type_id='early')
         rotation_list = [reviewer_low, reviewer_high, reviewer_unavailable]
 
-        # Trigger previous review check and completed review stats - TODO: something something related documents
-        ReviewAssignmentFactory(review_request__team=team, review_request__doc=doc, reviewer=reviewer_high.email(), state_id='completed')
+        # Trigger previous review check (including finding ancestor documents) and completed review stats.
+        ReviewAssignmentFactory(review_request__team=team, review_request__doc=doc_individual, reviewer=reviewer_high.email(), state_id='completed')
         # Trigger other review stats
         ReviewAssignmentFactory(review_request__team=team, review_request__doc=doc, reviewer=reviewer_high.email(), state_id='no-response')
         ReviewAssignmentFactory(review_request__team=team, review_request__doc=doc, reviewer=reviewer_high.email(), state_id='part-completed')