exclude doubling up reviews when in both staff and reviewers

opentech/apply/funds/models.py

@@ -648,11 +648,17 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss
             submission_in_db.next = self
             submission_in_db.save()
 
+    @property
     def missing_staff_reviews(self):
         return self.reviewers.staff().exclude(id__in=self.reviews.values('author'))
 
+    @property
     def missing_reviewer_reviews(self):
-        return self.reviewers.reviewers().exclude(id__in=self.reviews.values('author'))
+        return self.reviewers.reviewers().exclude(
+            id__in=self.reviews.values('author')
+        ).exclude(
+            id__in=self.missing_staff_reviews,
+        )
 
     def data_and_fields(self):
         for stream_value in self.form_fields:

opentech/apply/review/views.py

@@ -10,7 +10,7 @@ from .models import Review
 class ReviewContextMixin:
     def get_context_data(self, **kwargs):
         staff_reviews = self.object.reviews.by_staff()
-        reviewer_reviews = self.object.reviews.by_reviewers()
+        reviewer_reviews = self.object.reviews.by_reviewers().exclude(id__in=staff_reviews)
         return super().get_context_data(
             staff_reviews=staff_reviews,
             reviewer_reviews=reviewer_reviews,