update scoring/export to cope with marking sessions

Author: struan

crowdsourcer/fixtures/basics.json

@@ -8,6 +8,15 @@
     "active": true
   }
 },
+{
+  "model": "crowdsourcer.markingsession",
+  "pk": 2,
+  "fields": {
+    "label": "Second Session",
+    "start_date": "2023-03-01",
+    "active": true
+  }
+},
 {
   "model": "crowdsourcer.section",
   "pk": 1,
@@ -64,6 +73,14 @@
     "title": "Waste Reduction & Food"
   }
 },
+{
+  "model": "crowdsourcer.section",
+  "pk": 8,
+  "fields": {
+    "marking_session": 2,
+    "title": "Second Session Section"
+  }
+},
 {
   "model": "crowdsourcer.questiongroup",
   "pk": 1,

crowdsourcer/management/commands/export_marks.py

@@ -3,7 +3,7 @@
 
 import pandas as pd
 
-from crowdsourcer.models import Question
+from crowdsourcer.models import MarkingSession, Question
 from crowdsourcer.scoring import get_all_question_data, get_scoring_object
 
 
@@ -27,6 +27,10 @@ def add_arguments(self, parser):
             "--output_answers", action="store_true", help="Output the all answers file"
         )
 
+        parser.add_argument(
+            "--session", action="store", help="Name of the marking session to use"
+        )
+
     def write_files(
         self, percent_marks, raw_marks, linear, answers=None, questions=None
     ):
@@ -58,11 +62,18 @@ def write_files(
     def handle(
         self, quiet: bool = False, output_answers: bool = False, *args, **options
     ):
+        session_label = options["session"]
+        try:
+            session = MarkingSession.objects.get(label=session_label)
+        except MarkingSession.DoesNotExist:
+            self.stderr.write(f"No such session: {session_label}")
+            return
+
         raw = []
         percent = []
         linear = []
 
-        scoring = get_scoring_object()
+        scoring = get_scoring_object(session)
 
         for council, council_score in scoring["section_totals"].items():
 

crowdsourcer/scoring.py

@@ -138,15 +138,15 @@ def weighting_to_points(weighting="low", max_points=0):
     return points
 
 
-def get_section_maxes(scoring):
+def get_section_maxes(scoring, session):
     section_maxes = defaultdict(dict)
     section_weighted_maxes = defaultdict(dict)
     group_totals = defaultdict(int)
     q_maxes = defaultdict(int)
     q_weighted_maxes = defaultdict(int)
     negative_q = defaultdict(int)
 
-    for section in Section.objects.all():
+    for section in Section.objects.filter(marking_session=session):
         q_section_maxes = {}
         q_section_weighted_maxes = {}
         q_section_negatives = {}
@@ -309,21 +309,21 @@ def get_maxes_for_council(scoring, group, country, council):
     return maxes, weighted_maxes
 
 
-def get_blank_section_scores():
+def get_blank_section_scores(session):
     raw_scores = defaultdict(dict)
     weighted = defaultdict(dict)
 
     non_ca_sections = {
         x: 0
-        for x in Section.objects.exclude(title__contains="(CA)").values_list(
-            "title", flat=True
-        )
+        for x in Section.objects.exclude(title__contains="(CA)")
+        .filter(marking_session=session)
+        .values_list("title", flat=True)
     }
     ca_sections = {
         x: 0
-        for x in Section.objects.filter(title__contains="(CA)").values_list(
-            "title", flat=True
-        )
+        for x in Section.objects.filter(
+            title__contains="(CA)", marking_session=session
+        ).values_list("title", flat=True)
     }
 
     for council in PublicAuthority.objects.filter(do_not_mark=False).all():
@@ -346,12 +346,12 @@ def get_weighted_question_score(score, max_score, weighting):
     return percentage * weighting_to_points(weighting)
 
 
-def get_section_scores(scoring):
-    raw_scores, weighted = get_blank_section_scores()
+def get_section_scores(scoring, session):
+    raw_scores, weighted = get_blank_section_scores(session)
 
     update_with_housing_exceptions()
 
-    for section in Section.objects.all():
+    for section in Section.objects.filter(marking_session=session):
         options = (
             Response.objects.filter(
                 response_type__type="Audit",
@@ -526,7 +526,7 @@ def calculate_council_totals(scoring):
     scoring["section_totals"] = section_totals
 
 
-def get_scoring_object():
+def get_scoring_object(session):
     scoring = {}
 
     council_gss_map, groups, countries, types, control = PublicAuthority.maps()
@@ -539,8 +539,8 @@ def get_scoring_object():
     for council in PublicAuthority.objects.all():
         scoring["councils"][council.name] = council
 
-    get_section_maxes(scoring)
-    get_section_scores(scoring)
+    get_section_maxes(scoring, session)
+    get_section_scores(scoring, session)
     calculate_council_totals(scoring)
 
     return scoring

crowdsourcer/tests/test_export.py

@@ -5,7 +5,7 @@
 from django.core.management import call_command
 from django.test import TestCase
 
-from crowdsourcer.models import Question, Response
+from crowdsourcer.models import MarkingSession, Question, Response
 from crowdsourcer.scoring import get_section_maxes
 
 max_section = {
@@ -161,9 +161,12 @@ class ExportNoMarksTestCase(BaseCommandTestCase):
         "options.json",
     ]
 
+    def setUp(self):
+        self.session = MarkingSession.objects.get(label="Default")
+
     def test_max_calculation(self):
         scoring = {}
-        get_section_maxes(scoring)
+        get_section_maxes(scoring, self.session)
 
         self.assertEquals(scoring["section_maxes"], max_section)
         self.assertEquals(scoring["group_maxes"], max_totals)
@@ -174,7 +177,7 @@ def test_max_calculation_with_unweighted_q(self):
         Question.objects.filter(pk=272).update(weighting="unweighted")
 
         scoring = {}
-        get_section_maxes(scoring)
+        get_section_maxes(scoring, self.session)
 
         local_max_w = max_weighted.copy()
         local_max_w["Buildings & Heating"] = {
@@ -197,9 +200,7 @@ def test_max_calculation_with_unweighted_q(self):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export_with_no_marks(self, write_mock):
-        self.call_command(
-            "export_marks",
-        )
+        self.call_command("export_marks", session="Default")
 
         expected_percent = [
             {
@@ -329,7 +330,7 @@ def test_max_calculation(self):
         scoring = {}
         expected_max_q = deepcopy(max_questions)
         expected_max_q["Buildings & Heating"]["20"] = 0
-        get_section_maxes(scoring)
+        get_section_maxes(scoring, MarkingSession.objects.get(label="Default"))
 
         self.assertEquals(scoring["section_maxes"], max_section)
         self.assertEquals(scoring["group_maxes"], max_totals)
@@ -478,7 +479,7 @@ class ExportWithMarksTestCase(BaseCommandTestCase):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export(self, write_mock):
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         percent, raw, linear = write_mock.call_args[0]
         self.assertEquals(raw, self.expected_raw)
@@ -491,7 +492,7 @@ def test_export(self, write_mock):
     def test_export_with_unweighted_q(self, write_mock):
         Question.objects.filter(pk=272).update(weighting="unweighted")
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         expected_percent = deepcopy(self.expected_percent)
         expected_percent[0]["Buildings & Heating"] = 0.17
@@ -508,7 +509,7 @@ def test_export_with_unweighted_q(self, write_mock):
     def test_export_with_exceptions(self, write_mock):
         Response.objects.filter(question_id=282, authority_id=2).delete()
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
         expected_linear = deepcopy(self.expected_linear)
 
         expected_linear[1] = (
@@ -552,7 +553,7 @@ def test_export_with_score_exceptions(self, write_mock):
         r.multi_option.add(161)
         r.save()
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
         expected_linear = deepcopy(self.expected_linear)
 
         expected_linear[1] = (
@@ -610,7 +611,7 @@ def test_export_with_score_exceptions(self, write_mock):
         expected_percent[1]["raw_total"] = 0.07
         expected_percent[1]["weighted_total"] = 0.2
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
         percent, raw, linear = write_mock.call_args[0]
         self.assertEquals(linear, expected_linear)
         self.assertEquals(raw, expected_raw)
@@ -622,7 +623,7 @@ def test_export_with_score_exceptions(self, write_mock):
     def test_export_with_council_type_exceptions(self, write_mock):
         Response.objects.filter(question_id=282, authority_id=2).delete()
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
         expected_linear = deepcopy(self.expected_linear)
 
         expected_linear[1] = (
@@ -660,7 +661,7 @@ def test_export_with_council_type_exceptions(self, write_mock):
     def test_export_with_council_name_exceptions(self, write_mock):
         Response.objects.filter(question_id=282, authority_id=2).delete()
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
         expected_linear = deepcopy(self.expected_linear)
 
         expected_linear[1] = (
@@ -703,7 +704,7 @@ def test_export_with_housing_exception(self, write_mock):
         r.option_id = 205
         r.save()
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         expected_linear = deepcopy(self.expected_linear)
 
@@ -808,7 +809,7 @@ class ExportWithMarksNegativeQTestCase(BaseCommandTestCase):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export(self, write_mock):
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         percent, raw, linear = write_mock.call_args[0]
         self.assertEquals(raw, self.expected_raw)
@@ -829,7 +830,7 @@ class ExportWithMultiMarksTestCase(BaseCommandTestCase):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export(self, write_mock):
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         expected_percent = [
             {
@@ -934,7 +935,7 @@ class ExportWithMoreMarksTestCase(BaseCommandTestCase):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export(self, write_mock):
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         expected_percent = [
             {
@@ -1039,7 +1040,7 @@ class ExportNoMarksCATestCase(BaseCommandTestCase):
 
     def test_max_calculation(self):
         scoring = {}
-        get_section_maxes(scoring)
+        get_section_maxes(scoring, MarkingSession.objects.get(label="Default"))
 
         ca_max_section = {
             **max_section,
@@ -1092,9 +1093,7 @@ def test_max_calculation(self):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export_with_no_marks(self, write_mock):
-        self.call_command(
-            "export_marks",
-        )
+        self.call_command("export_marks", session="Default")
 
         expected_percent = [
             {
@@ -1379,7 +1378,7 @@ class ExportWithMoreMarksCATestCase(BaseCommandTestCase):
     @mock.patch("crowdsourcer.scoring.EXCEPTIONS", {})
     @mock.patch("crowdsourcer.scoring.SCORE_EXCEPTIONS", {})
     def test_export(self, write_mock):
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         percent, raw, linear = write_mock.call_args[0]
 
@@ -1394,7 +1393,7 @@ def test_export_100_percent(self, write_mock):
         Response.objects.filter(pk=37).update(option_id=196)
         Response.objects.get(pk=36).multi_option.add(195)
 
-        self.call_command("export_marks")
+        self.call_command("export_marks", session="Default")
 
         expected_raw = self.expected_raw.copy()
         expected_percent = self.expected_percent.copy()

crowdsourcer/views/stats.py

@@ -9,6 +9,7 @@
 from django.utils.text import slugify
 from django.views.generic import ListView, TemplateView
 
+from crowdsourcer.mixins import CurrentMarkingSessionMixin
 from crowdsourcer.models import Option, PublicAuthority, Question, Response
 from crowdsourcer.scoring import (
     get_all_question_data,
@@ -338,12 +339,12 @@ def get_response_data(self, response):
         return data
 
 
-class BaseScoresView(UserPassesTestMixin, TemplateView):
+class BaseScoresView(UserPassesTestMixin, CurrentMarkingSessionMixin, TemplateView):
     def test_func(self):
         return self.request.user.is_superuser
 
     def get_scores(self):
-        self.scoring = get_scoring_object()
+        self.scoring = get_scoring_object(self.current_session)
 
     def render_to_response(self, context, **response_kwargs):
         response = HttpResponse(