Fixes in MPContestController

oioioi/mp/controllers.py

@@ -5,7 +5,7 @@
 
 from oioioi.base.utils.query_helpers import Q_always_true
 from oioioi.base.utils.redirect import safe_redirect
-from oioioi.contests.models import Submission
+from oioioi.contests.models import Submission, SubmissionReport
 from oioioi.mp.models import MPRegistration, SubmissionScoreMultiplier
 from oioioi.mp.score import FloatScore
 from oioioi.participants.controllers import ParticipantsController
@@ -139,8 +139,20 @@ def update_user_result_for_problem(self, result):
                 ):
                     best_submission = [submission, score]
 
+            try:
+                report = SubmissionReport.objects.get(
+                    submission=best_submission[0], status='ACTIVE', kind='NORMAL'
+                )
+            except SubmissionReport.DoesNotExist:
+                report = None
+
             result.score = best_submission[1]
             result.status = best_submission[0].status
+            result.submission_report = report
+        else:
+            result.score = None
+            result.status = None
+            result.submission_report = None
 
     def can_submit(self, request, problem_instance, check_round_times=True):
         """Contest admin can always submit.
@@ -155,6 +167,8 @@ def can_submit(self, request, problem_instance, check_round_times=True):
             return True
         if not is_participant(request):
             return False
+        if problem_instance.round is None:
+            return False
 
         rtimes = self.get_round_times(None, problem_instance.round)
         round_over_contest_running = rtimes.is_past(

oioioi/mp/fixtures/test_mp_contest.json

@@ -13,6 +13,16 @@
             "enable_editor": false
         }
     },
+    {
+        "model": "participants.participant",
+        "pk": 1,
+        "fields": {
+            "contest": "contest1",
+            "user": 2,
+            "status": "ACTIVE",
+            "anonymous": false
+        }
+    },
     {
         "model": "problems.problem",
         "pk": 1,
@@ -105,6 +115,18 @@
             "needs_rejudge": false
         }
     },
+    {
+        "model": "contests.probleminstance",
+        "pk": 5,
+        "fields": {
+            "contest": "contest1",
+            "round": null,
+            "problem": 1,
+            "short_name": "squ2",
+            "submissions_limit": 10,
+            "needs_rejudge": false
+        }
+    },
     {
         "model": "contests.submission",
         "pk": 1,

oioioi/mp/tests.py

@@ -66,6 +66,23 @@ def test_no_zero_scores_in_ranking(self):
             self.assertFalse(re.search(b'<td[^>]*>Test User4', response.content))
 
 
+class TestNoRoundProblem(TestCase):
+    fixtures = ['test_mp_users', 'test_mp_contest']
+
+    def test_no_round_problem(self):
+        self.assertTrue(self.client.login(username='test_user1'))
+        contest = Contest.objects.get()
+        url = reverse('submit', kwargs={'contest_id': contest.id})
+        with fake_time(datetime(2023, 1, 5, 12, 10, tzinfo=utc)):
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            self.assertIn('form', response.context)
+            form = response.context['form']
+            # there are 3 problems, one of them doesn't have round
+            # +1 because of blank field
+            self.assertEqual(len(form.fields['problem_instance_id'].choices), 3)
+
+
 class TestSubmissionScoreMultiplier(TestCase):
     def _create_result(user, pi):
         res = UserResultForProblem()