altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
- Legacy-Id: 17046
Note: SVN reference [16981] has been migrated to Git commit f740adcfc1
This commit is contained in:
Sasha Romijn 2019-11-18 10:27:18 +00:00
parent c36fcdc5a7
commit c5ecfab29f
2 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ietf/review/policies.py
View file

@ -7,6 +7,7 @@ import re
import six import six
from ietf.doc.models import DocumentAuthor, DocAlias 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.group.models import Role
from ietf.person.models import Person from ietf.person.models import Person
import debug # pyflakes:ignore import debug # pyflakes:ignore
@ -261,11 +262,13 @@ class AssignmentOrderResolver:
def _persons_with_previous_review(self, review_req, possible_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. 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( has_reviewed_previous = ReviewRequest.objects.filter(
doc=review_req.doc, doc__name__in=doc_names,
reviewassignment__reviewer__person__in=possible_person_ids, reviewassignment__reviewer__person__in=possible_person_ids,
reviewassignment__state="completed", reviewassignment__state="completed",
team=self.team, team=self.team,
@ -313,6 +316,8 @@ class RotateWithSkipReviewerQueuePolicy(AbstractReviewerQueuePolicy):
print('with skipped {}'.format([r for r in rotation_list])) print('with skipped {}'.format([r for r in rotation_list]))
print('without skip {}'.format([r for r in rotation_list_without_skip])) 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])) 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 in_order_assignment = rotation_list_without_skip[0] == assignee_person
print('in order: {}'.format(in_order_assignment)) print('in order: {}'.format(in_order_assignment))
@ -320,23 +325,24 @@ class RotateWithSkipReviewerQueuePolicy(AbstractReviewerQueuePolicy):
# who is not the current assignee. Anyone with skip_next>0 encountered before # who is not the current assignee. Anyone with skip_next>0 encountered before
# has their skip_next decreased. # has their skip_next decreased.
current_idx = 0 current_idx = 0
while in_order_assignment: if in_order_assignment:
current_idx_person = reviewer_at_index(current_idx) while True:
settings = reviewer_settings_for(current_idx_person) current_idx_person = reviewer_at_index(current_idx)
print('evaluating {} with skip_next {}, assignee {}'.format(current_idx_person, settings.skip_next, assignee_person)) settings = reviewer_settings_for(current_idx_person)
if settings.skip_next > 0: print('evaluating {} with skip_next {}, assignee {}'.format(current_idx_person, settings.skip_next, assignee_person))
print('dropping skip_next') if settings.skip_next > 0:
settings.skip_next -= 1 print('dropping skip_next')
settings.save() settings.skip_next -= 1
elif current_idx_person != assignee_person: settings.save()
print('nr appointed') elif current_idx_person != assignee_person:
nr = NextReviewerInTeam.objects.filter(team=self.team).first() or NextReviewerInTeam( print('nr appointed')
team=self.team) nr = NextReviewerInTeam.objects.filter(team=self.team).first() or NextReviewerInTeam(
nr.next_reviewer = current_idx_person team=self.team)
nr.save() nr.next_reviewer = current_idx_person
nr.save()
break
current_idx += 1 break
current_idx += 1
if add_skip: if add_skip:
print('raising skip count for assignee') print('raising skip count for assignee')

13
ietf/review/test_policies.py
View file

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