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

Merged in [16850] from sasha@dashcare.nl:

Browse source 
Fix #2185 - Close review assignments when reviewer is removed from team.
If a reviewer is removed from a team, any accepted or assigned review
assignments are set to rejected if the request deadline has not passed,
or set to no-response when the request deadline has passed.
Per [16819], if this scenario happens, and there are no other active or 
completed review assignments, the request is shown as an
unassigned review.
 - Legacy-Id: 16897
Note: SVN reference [16819] has been migrated to Git commit fdb4c2a055

Note: SVN reference [16850] has been migrated to Git commit e145832808
This commit is contained in:
Henrik Levkowetz 2019-10-21 21:56:05 +00:00
parent 0313a4f58d e145832808
commit 1674356ee5
2 changed files with 57 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ietf/group/tests_info.py
View file

@ -36,7 +36,7 @@ from ietf.meeting.factories import SessionFactory
from ietf.name.models import DocTagName, GroupStateName, GroupTypeName
from ietf.person.models import Person, Email
from ietf.person.factories import PersonFactory
from ietf.review.factories import ReviewRequestFactory
from ietf.review.factories import ReviewRequestFactory, ReviewAssignmentFactory
from ietf.utils.mail import outbox, empty_outbox
from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects
@ -666,7 +666,8 @@ class GroupEditTests(TestCase):
def test_edit_reviewers(self):
group=GroupFactory(type_id='review',parent=GroupFactory(type_id='area'))
ReviewRequestFactory(team=group)
review_req = ReviewRequestFactory(team=group)
ad_email = Email.objects.get(address='ad2@example.org')
url = urlreverse('ietf.group.views.edit', kwargs=dict(group_type=group.type_id, acronym=group.acronym, action="edit"))
login_testing_unauthorized(self, "secretary", url)
@ -679,23 +680,48 @@ class GroupEditTests(TestCase):
# set reviewers
empty_outbox()
r = self.client.post(url,
dict(name=group.name,
acronym=group.acronym,
parent=group.parent_id,
ad=Person.objects.get(name="Areað Irector").pk,
state=group.state_id,
reviewer_roles="ad2@example.org",
list_email=group.list_email,
list_subscribe=group.list_subscribe,
list_archive=group.list_archive,
urls=""
))
post_data = dict(
name=group.name,
acronym=group.acronym,
parent=group.parent_id,
ad=Person.objects.get(name="Areað Irector").pk,
state=group.state_id,
list_email=group.list_email,
list_subscribe=group.list_subscribe,
list_archive=group.list_archive,
urls=""
)
r = self.client.post(url, dict(post_data, reviewer_roles=ad_email.address))
self.assertEqual(r.status_code, 302)
group = reload_db_objects(group)
self.assertEqual(list(group.role_set.filter(name="reviewer").values_list("email", flat=True)), ["ad2@example.org"])
self.assertEqual(list(group.role_set.filter(name="reviewer").values_list("email", flat=True)), [ad_email.address])
self.assertTrue('Personnel change' in outbox[0]['Subject'])
# Assign a review to the reviewer, then remove the reviewer from the group
# As the request deadline has not passed, the assignment should be set to rejected
review_assignment = ReviewAssignmentFactory(review_request=review_req, state_id='assigned', reviewer=ad_email)
r = self.client.post(url, post_data)
self.assertEqual(r.status_code, 302)
group = reload_db_objects(group)
self.assertFalse(group.role_set.filter(name="reviewer"))
review_assignment = reload_db_objects(review_assignment)
self.assertEqual(review_assignment.state_id, 'rejected')
# Repeat after adding reviewer again, but now beyond request deadline
r = self.client.post(url, dict(post_data, reviewer_roles=ad_email.address))
self.assertEqual(r.status_code, 302)
review_assignment.state_id = 'accepted'
review_assignment.save()
review_req.deadline = datetime.date.today() - datetime.timedelta(days=1)
review_req.save()
r = self.client.post(url, post_data)
self.assertEqual(r.status_code, 302)
review_assignment = reload_db_objects(review_assignment)
self.assertEqual(review_assignment.state_id, 'no-response')
def test_conclude(self):
group = GroupFactory(acronym="mars")

16
ietf/group/views.py
View file

@ -972,6 +972,22 @@ def edit(request, group_type=None, acronym=None, action="edit", field=None):
if deleted:
change_text=title + ' deleted: ' + ", ".join(x.name_and_email() for x in deleted)
personnel_change_text+=change_text+"\n"
today = datetime.date.today()
for deleted_email in deleted:
active_assignments = ReviewAssignment.objects.filter(
reviewer__person=deleted_email.person,
state_id__in=['accepted', 'assigned'],
)
for assignment in active_assignments:
if assignment.review_request.deadline > today:
assignment.state_id = 'rejected'
else:
assignment.state_id = 'no-response'
# save() will update review_request state to 'requested'
# if needed, so that the review can be assigned to someone else
assignment.save()
changed_personnel.update(set(old)^set(new))
if personnel_change_text!="":