GH-985: Make sure superusers dont fall through the cracks

opentech/apply/funds/migrations/0062_data_migrate_type_for_assigned_reviewers.py

@@ -29,12 +29,15 @@ def add_reviewer_type(apps, schema_editor):
                 groups = {PARTNER_GROUP_NAME}
             elif COMMUNITY_REVIEWER_GROUP_NAME in groups:
                 groups = {COMMUNITY_REVIEWER_GROUP_NAME}
-            elif review.author.is_staff or review.author.is_superuser:
+            elif assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
                 groups = {STAFF_GROUP_NAME}
             else:
                 groups = {REVIEWER_GROUP_NAME}
         elif not groups:
-            groups = {REVIEWER_GROUP_NAME}
+            if assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
+                groups = {STAFF_GROUP_NAME}
+            else:
+                groups = {REVIEWER_GROUP_NAME}
 
         group = Group.objects.get(name=groups.pop())
         assigned.type = group

opentech/apply/funds/models/submissions.py

@@ -792,7 +792,10 @@ class AssignedReviewersQuerySet(models.QuerySet):
             else:
                 groups = {REVIEWER_GROUP_NAME}
         elif not groups:
-            groups = {REVIEWER_GROUP_NAME}
+            if assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
+                groups = {STAFF_GROUP_NAME}
+            else:
+                groups = {REVIEWER_GROUP_NAME}
 
         group = Group.objects.get(name=groups.pop())
 

opentech/apply/review/migrations/0018_migrate_author_data.py

@@ -36,7 +36,10 @@ def add_to_assigned_reviewers(apps, schema_editor):
             else:
                 groups = {REVIEWER_GROUP_NAME}
         elif not groups:
-            groups = {REVIEWER_GROUP_NAME}
+            if assigned.reviewer.is_staff or assigned.reviewer.is_superuser:
+                groups = {STAFF_GROUP_NAME}
+            else:
+                groups = {REVIEWER_GROUP_NAME}
 
         group = Group.objects.get(name=groups.pop())