Refactor

Author: MasloMaslane

oioioi/acm/controllers.py

@@ -201,7 +201,7 @@ def can_see_round(self, request_or_context, round, no_admin=False):
     def get_default_safe_exec_mode(self):
         return 'cpu'
 
-    def calculate_score_diff(self):
+    def display_score_change(self):
         return False
 
 

oioioi/contests/admin.py

@@ -712,7 +712,7 @@ def get_list_display(self, request):
         ]
         if request.contest:
             list_display.remove('contest_display')
-            if request.contest.controller.calculate_score_diff():
+            if request.contest.controller.display_score_change():
                 list_display.append('score_diff_display')
         return list_display
 
@@ -852,7 +852,7 @@ def score_display(self, instance):
 
     def score_diff_display(self, instance):
         if instance.score_diff is not None:
-            return format_html(instance.problem_instance.contest.controller.render_score_diff(instance.score_diff))
+            return format_html(instance.problem_instance.contest.controller.render_score_change(instance.score_diff))
         return format_html('<span class="text-secondary">-</span>')
 
     score_diff_display.short_description = _("Score change")

oioioi/contests/controllers.py

@@ -975,24 +975,32 @@ def _is_partial_score(self, test_report):
     def show_default_fields(self, problem_instance):
         return problem_instance.problem.controller.show_default_fields(problem_instance)
 
-    def calculate_score_diff(self):
+    def display_score_change(self):
+        """
+        Whether to display score change for a submission in submissions admin.
+        """
         return True
 
-    def score_diff(self, before, after):
-        print(before, after)
+    def calculate_score_change(self, before, after):
+        """
+        Calculate score difference between two scores.
+        """
         if before is None:
             return after
-        return IntegerScore(after.to_int() - before.to_int())
+        cls = type(before)
+        return cls(after.value - before.value)
 
-    def render_score_diff(self, diff):
-        print(diff)
+    def render_score_change(self, diff):
+        """
+        Render score change.
+        """
         if diff is None:
             return '<span class="text-secondary">-</span>'
-        if diff.to_int() == 0:
+        if diff.value == 0:
             return '<span class="text-secondary">0</span>'
-        if diff.to_int() > 0:
-            return f'<span class="text-success">+{diff.to_int()}</span>'
-        return f'<span class="text-danger">-{diff.to_int()}</span>'
+        if diff.value > 0:
+            return f'<span class="text-success">+{diff.value}</span>'
+        return f'<span class="text-danger">{diff.value}</span>'
 
 
 class PastRoundsHiddenContestControllerMixin(object):

oioioi/contests/tests/tests.py

@@ -4210,29 +4210,29 @@ class TestScoreDiff(TestCase):
         'test_submission',
     ]
 
+    submission_cls = IntegerScore
+    diff_cls = IntegerScore
+
+    def _set_contest_controller(self, name):
+        contest = Contest.objects.get()
+        contest.controller_name = name
+        contest.save()
+
     def _test_diff(self, new_score, expected_diff):
         pi = ProblemInstance.objects.get()
         user = User.objects.get(username='test_user')
         new_submission = Submission.objects.create(
             problem_instance=pi,
             user=user,
-            score=IntegerScore(new_score),
+            score=self.submission_cls(new_score),
             status='OK',
         )
         pi.controller.update_user_results(user, pi, new_submission)
-        assert new_submission.score_diff == IntegerScore(expected_diff)
+        assert new_submission.score_diff == self.diff_cls(expected_diff)
 
+class TestScoreDiffProgrammingContest(TestScoreDiff):
     def test_simple_programming_contest(self):
         # Simple programming contest takes last score as the final one.
         self._test_diff(50, 50 - 34)
         self._test_diff(100, 100 - 50)
         self._test_diff(20, 20 - 100)
-
-    def test_oi_finals_contest(self):
-        # OI finals contest takes the best score as the final one.
-        contest = Contest.objects.get()
-        contest.controller_name = 'oioioi.oi.controllers.OIFinalOnsiteContestController'
-        contest.save()
-        self._test_diff(50, 50 - 34)
-        self._test_diff(100, 100 - 50)
-        self._test_diff(20, 0)

oioioi/oi/tests.py

@@ -12,6 +12,7 @@
 from oioioi.contests.current_contest import ContestMode
 from oioioi.contests.handlers import update_user_results
 from oioioi.contests.models import Contest, ProblemInstance, Round
+from oioioi.contests.tests.tests import TestScoreDiff
 from oioioi.evalmgr.tasks import create_environ
 from oioioi.oi.management.commands import import_schools
 from oioioi.oi.models import OIRegistration, School
@@ -616,3 +617,12 @@ def test_user_info_page(self):
                     self.assertContains(response, reg_data[k])
                 else:
                     self.assertNotContains(response, reg_data[k], status_code=403)
+
+
+class TestScoreDiffOIContest(TestScoreDiff):
+    def test_oi_finals_contest(self):
+        # OI finals contest takes the best score as the final one.
+        self._set_contest_controller('oioioi.oi.controllers.OIFinalOnsiteContestController')
+        self._test_diff(50, 50 - 34)
+        self._test_diff(100, 100 - 50)
+        self._test_diff(20, 0)

oioioi/problems/controllers.py

@@ -480,16 +480,16 @@ def update_user_results(self, user, problem_instance, submission):
             ) = UserResultForProblem.objects.select_for_update().get_or_create(
                 user=user, problem_instance=problem_instance
             )
-            if problem_instance.controller.calculate_score_diff():
+            if problem_instance.controller.display_score_change():
                 if created:
                     score_before = None
                 else:
                     score_before = result.score
             problem_instance.controller.update_user_result_for_problem(result)
             result.save()
-            if problem_instance.controller.calculate_score_diff():
+            if problem_instance.controller.display_score_change():
                 score_after = result.score
-                submission.score_diff = problem_instance.controller.score_diff(
+                submission.score_diff = problem_instance.controller.calculate_score_change(
                     score_before, score_after
                 )
                 submission.save()