update code to handle authorities belonging to sessions

crowdsourcer/fixtures/authorities.json

@@ -8,7 +8,8 @@
     "website": "https://www.aberdeencity.gov.uk",
     "country": "scotland",
     "type": "UTA",
-    "questiongroup": 1
+    "questiongroup": 1,
+    "marking_session": [1,2]
   }
 },
 {
@@ -20,7 +21,8 @@
     "website": "https://www.aberdeenshire.gov.uk",
     "country": "scotland",
     "type": "UTA",
-    "questiongroup": 1
+    "questiongroup": 1,
+    "marking_session": [1,2]
   }
 },
 {
@@ -32,7 +34,8 @@
     "website": "https://www.adur-worthing.gov.uk/",
     "country": "england",
     "type": "DIS",
-    "questiongroup": 2
+    "questiongroup": 2,
+    "marking_session": [1,2]
   }
 },
 {
@@ -45,7 +48,8 @@
     "questiongroup": 2,
     "country": "northern ireland",
     "type": "NID",
-    "do_not_mark": true
+    "do_not_mark": true,
+    "marking_session": [1]
   }
 }
 ]

crowdsourcer/fixtures/authorities_ca.json

@@ -7,7 +7,8 @@
     "name": "A Combined Authority",
     "website": "https://www.example.org",
     "type": "COMB",
-    "questiongroup": 5
+    "questiongroup": 5,
+    "marking_session": [1]
   }
 }
 ]

crowdsourcer/models.py

@@ -176,7 +176,7 @@ def response_counts(
             question_types = Question.VOLUNTEER_TYPES
 
         authorities = cls.objects.filter(
-            questiongroup__question__in=questions
+            marking_session=marking_session, questiongroup__question__in=questions
         ).annotate(
             num_questions=Subquery(
                 Question.objects.filter(

crowdsourcer/scoring.py

@@ -338,7 +338,9 @@ def get_blank_section_scores(session):
     }
 
     for council in PublicAuthority.objects.filter(
-        questiongroup__marking_session=session, do_not_mark=False
+        marking_session=session,
+        questiongroup__marking_session=session,
+        do_not_mark=False,
     ).all():
         if council.type == "COMB":
             weighted[council.name] = ca_sections.copy()
@@ -564,7 +566,7 @@ def get_scoring_object(session):
     scoring["council_control"] = control
     scoring["councils"] = {}
     for council in PublicAuthority.objects.filter(
-        questiongroup__marking_session=session
+        marking_session=session, questiongroup__marking_session=session
     ):
         scoring["councils"][council.name] = council
 

crowdsourcer/views/base.py

@@ -379,7 +379,8 @@ def test_func(self):
     def get_queryset(self):
         rt = ResponseType.objects.get(type=self.stage)
         qs = PublicAuthority.objects.filter(
-            questiongroup__marking_session=self.request.current_session
+            marking_session=self.request.current_session,
+            questiongroup__marking_session=self.request.current_session,
         ).annotate(
             num_sections=Subquery(
                 Assigned.objects.filter(

crowdsourcer/views/progress.py

@@ -66,7 +66,8 @@ def get_queryset(self):
         response_type = ResponseType.objects.get(type=self.stage)
         qs = (
             PublicAuthority.objects.filter(
-                questiongroup__marking_session=self.request.current_session
+                marking_session=self.request.current_session,
+                questiongroup__marking_session=self.request.current_session,
             )
             .annotate(
                 num_questions=Subquery(
@@ -399,7 +400,8 @@ def test_func(self):
     def get_queryset(self):
         authorities = (
             PublicAuthority.objects.filter(
-                questiongroup__marking_session=self.request.current_session
+                marking_session=self.request.current_session,
+                questiongroup__marking_session=self.request.current_session,
             )
             .annotate(
                 has_logged_in=Subquery(

crowdsourcer/views/volunteers.py

@@ -14,7 +14,14 @@
     VolunteerAssignmentFormset,
     VolunteerBulkAssignForm,
 )
-from crowdsourcer.models import Assigned, Marker, PublicAuthority, ResponseType, Section
+from crowdsourcer.models import (
+    Assigned,
+    Marker,
+    MarkingSession,
+    PublicAuthority,
+    ResponseType,
+    Section,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -154,8 +161,10 @@ def get_queryset(self):
         ):
             return []
 
+        marking_session = MarkingSession.objects.get(id=self.request.GET["ms"])
         return PublicAuthority.objects.filter(
-            questiongroup__marking_session__id=self.request.GET["ms"]
+            marking_session=marking_session,
+            questiongroup__marking_session=marking_session,
         ).exclude(
             id__in=Assigned.objects.filter(
                 response_type=self.request.GET["rt"],
@@ -236,7 +245,7 @@ def form_valid(self, form):
             ).values("authority")
 
             to_assign = PublicAuthority.objects.filter(
-                questiongroup__marking_session=ms
+                marking_session=ms, questiongroup__marking_session=ms
             ).exclude(id__in=assigned)[:num_assignments]
 
             for a in to_assign: