Skip to content

Commit

Permalink
fix: dont block on open requests for a previous version. Add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rjsparks committed Jul 11, 2023
1 parent f63da58 commit f8007fb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
13 changes: 13 additions & 0 deletions ietf/group/tests_review.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,20 @@ def test_suggested_review_requests(self):

self.assertEqual(list(suggested_review_requests_for_team(team)), [])

# blocked by an already existing request (don't suggest it again)
review_req.state_id = "requested"
review_req.save()
self.assertEqual(list(suggested_review_requests_for_team(team)), [])

# ... but not for a previous version
review_req.requested_rev = prev_rev
review_req.save()
self.assertEqual(len(suggested_review_requests_for_team(team)), 1)


# blocked by completion
review_req.state = ReviewRequestStateName.objects.get(slug="assigned")
review_req.requested_rev = ""
review_req.save()
assignment.state = ReviewAssignmentStateName.objects.get(slug="completed")
assignment.reviewed_rev = review_req.doc.rev
Expand All @@ -116,6 +128,7 @@ def test_suggested_review_requests(self):

self.assertEqual(len(suggested_review_requests_for_team(team)), 1)


def test_suggested_review_requests_on_lc_and_telechat(self):
review_req = ReviewRequestFactory(state_id='assigned')
doc = review_req.doc
Expand Down
2 changes: 1 addition & 1 deletion ietf/review/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ def blocks(existing, request):
and (not existing.requested_rev or existing.requested_rev == request.doc.rev))
request_closed = existing.state_id not in ('requested','assigned')
# Is there a review request for this document already in system
requested = existing.state_id in ('requested')
requested = existing.state_id in ('requested') and (not existing.requested_rev or existing.requested_rev == request.doc.rev)
# at least one assignment was completed for the requested version or the current doc version if no specific version was requested:
some_assignment_completed = existing.reviewassignment_set.filter(reviewed_rev=existing.requested_rev or existing.doc.rev, state_id='completed').exists()

Expand Down

0 comments on commit f8007fb

Please sign in to comment.