GH-958: reassign users

opentech/apply/funds/forms.py

@@ -260,6 +260,13 @@ class BatchUpdateReviewersForm(forms.Form):
                     ).reviews.filter(author=assigned.reviewer).exists()
                 ]
 
+                # Being reassigned
+                AssignedReviewers.objects.filter(
+                    submission__in=submissions,
+                    role__isnull=False,
+                    reviewer=reviewer,
+                ).delete()
+
                 existing_assignments.update(reviewer=reviewer)
 
                 AssignedReviewers.objects.bulk_create(

opentech/apply/funds/tests/views/test_batch_reviewers.py

@@ -64,6 +64,17 @@ class StaffTestCase(BaseBatchReviewerTestCase):
             self.assertEqual(submission.assigned.first().reviewer, self.staff[0])
             self.assertEqual(submission.assigned.first().role, self.roles[0])
 
+    def test_can_reassign_from_other_role_reviewers(self):
+        AssignedWithRoleReviewersFactory(reviewer=self.staff[0], submission=self.submissions[0], role=self.roles[1])
+        AssignedWithRoleReviewersFactory(reviewer=self.staff[0], submission=self.submissions[1], role=self.roles[1])
+        submissions = self.submissions[0:2]
+        reviewer_roles = [self.staff[0]]
+        self.post_page(data=self.data(reviewer_roles, submissions))
+        for submission in submissions:
+            self.assertEqual(submission.assigned.count(), 1)
+            self.assertEqual(submission.assigned.first().reviewer, self.staff[0])
+            self.assertEqual(submission.assigned.first().role, self.roles[0])
+
     def test_doesnt_remove_if_already_reviewed(self):
         AssignedWithRoleReviewersFactory(reviewer=self.staff[1], submission=self.submissions[0], role=self.roles[0])
         ReviewFactory(author=self.staff[1], submission=self.submissions[0], draft=False)