From 14c845e74d63eec8b7ae5135a4514e9049122844 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Fri, 12 Jul 2024 13:17:05 +0500
Subject: [PATCH 1/4] show leaderboard and detailed result page to approved
 participants

---
 src/apps/api/views/submissions.py             |  8 +++----
 .../riot/competitions/detail/leaderboards.tag | 21 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/apps/api/views/submissions.py b/src/apps/api/views/submissions.py
index fccaeefd4..e52034493 100644
--- a/src/apps/api/views/submissions.py
+++ b/src/apps/api/views/submissions.py
@@ -325,14 +325,14 @@ def get_detail_result(self, request, pk):
         submission = Submission.objects.get(pk=pk)
         # Check if competition show visualization is true
         if submission.phase.competition.enable_detailed_results:
-            # get submission's competition participants
-            participants = submission.phase.competition.participants.all()
-            participant_usernames = [participant.user.username for participant in participants]
+            # get submission's competition approved participants
+            approved_participants = submission.phase.competition.participants.filter(status=CompetitionParticipant.APPROVED)
+            participant_usernames = [participant.user.username for participant in approved_participants]
 
             # check if in this competition
             # user is collaborator
             # or
-            # user is participant
+            # user is approved participant
             # or
             # user is creator
             # or
diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index 95b4fc793..8573a9243 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -41,7 +41,24 @@
             
         </tr>
         </thead>
-        <tbody>
+        <!--  Show when particpant registration is pending  -->
+        <tbody if="{participant_status === 'pending'}">
+            <tr class="center aligned ui yellow message">
+                <td colspan="100%">
+                    <em>Your request to participate in this competition is waiting for an approval from the competition organizer.</em>
+                </td>
+            </tr>
+        </tbody>
+        <!--  Show when particpant registration is denied  -->
+        <tbody if="{participant_status === 'denied'}">
+            <tr class="center aligned ui red message">
+                <td colspan="100%">
+                    <em>Your request to participate in this competition is denied. Please contact the competition organizer for more details.</em>
+                </td>
+            </tr>
+        </tbody>
+        <!--  Show when particpant registration is approved  -->
+        <tbody if="{participant_status === 'approved'}">
         <tr if="{_.isEmpty(selected_leaderboard.submissions)}" class="center aligned">
             <td colspan="100%">
                 <em>No submissions have been added to this leaderboard yet!</em>
@@ -71,6 +88,7 @@
         </tbody>
     </table>
 
+
     <script>
         let self = this
         self.selected_leaderboard = {}
@@ -201,6 +219,7 @@
 
         CODALAB.events.on('competition_loaded', (competition) => {
             self.competition_id = competition.id
+            self.participant_status = competition.participant_status
             self.opts.is_admin ? self.show_download = "visible": self.show_download = "hidden"
             self.enable_detailed_results = competition.enable_detailed_results
             self.show_detailed_results_in_leaderboard = competition.show_detailed_results_in_leaderboard

From b6cadb769683337c20b411af9d0d27b9873069ba Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Fri, 12 Jul 2024 14:08:43 +0500
Subject: [PATCH 2/4] detailed resutls test updated

---
 src/apps/api/tests/test_submissions.py | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/apps/api/tests/test_submissions.py b/src/apps/api/tests/test_submissions.py
index e91a64ecb..3de1d7a4a 100644
--- a/src/apps/api/tests/test_submissions.py
+++ b/src/apps/api/tests/test_submissions.py
@@ -26,9 +26,17 @@ def setUp(self):
         # Extra dummy user to test permissions, they shouldn't have access to many things
         self.other_user = UserFactory(username='other_user', password='other')
 
-        # Make a participant and submission into competition
-        self.participant = UserFactory(username='participant', password='other')
-        CompetitionParticipantFactory(user=self.participant, competition=self.comp)
+        # Make participants
+        self.participant = UserFactory(username='participant_approved', password='other')
+        self.pending_participant = UserFactory(username='participant_pending', password='other')
+        self.denied_participant = UserFactory(username='participant_denied', password='other')
+
+        # Add user as participants in a competition with different statuses
+        CompetitionParticipantFactory(user=self.participant, competition=self.comp, status=CompetitionParticipant.APPROVED)
+        CompetitionParticipantFactory(user=self.pending_participant, competition=self.comp, status=CompetitionParticipant.PENDING)
+        CompetitionParticipantFactory(user=self.denied_participant, competition=self.comp, status=CompetitionParticipant.DENIED)
+
+        # add submission with owner = approved participant
         self.existing_submission = SubmissionFactory(
             phase=self.phase,
             owner=self.participant,
@@ -232,11 +240,21 @@ def test_who_can_see_detailed_result_when_visualization_is_true(self):
         resp = self.client.get(url)
         assert resp.status_code == 200
 
-        # Actual user can see their submission detail result
+        # approved user can see submission detail result
         self.client.force_login(self.participant)
         resp = self.client.get(url)
         assert resp.status_code == 200
 
+        # pending user cannot see submission detail result
+        self.client.force_login(self.pending_participant)
+        resp = self.client.get(url)
+        assert resp.status_code == 403
+
+        # denied user cannot see submission detail result
+        self.client.force_login(self.pending_participant)
+        resp = self.client.get(url)
+        assert resp.status_code == 403
+
         # Regular user cannot see submission detail result
         self.client.force_login(self.other_user)
         resp = self.client.get(url)

From a0bb8d4c97f3606faa14f4482e1dfdd53cded6f6 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Wed, 17 Jul 2024 21:49:08 +0500
Subject: [PATCH 3/4] test fixed

---
 src/apps/api/tests/test_submissions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/api/tests/test_submissions.py b/src/apps/api/tests/test_submissions.py
index 3de1d7a4a..2ad0553a2 100644
--- a/src/apps/api/tests/test_submissions.py
+++ b/src/apps/api/tests/test_submissions.py
@@ -251,7 +251,7 @@ def test_who_can_see_detailed_result_when_visualization_is_true(self):
         assert resp.status_code == 403
 
         # denied user cannot see submission detail result
-        self.client.force_login(self.pending_participant)
+        self.client.force_login(self.denied_participant)
         resp = self.client.get(url)
         assert resp.status_code == 403
 

From ae2f48a4b42233216e278a7b71894ca8ef5fc902 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 18 Jul 2024 10:47:36 +0500
Subject: [PATCH 4/4] unregistered participant handled

---
 src/static/riot/competitions/detail/leaderboards.tag | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index 8573a9243..7ddef46ea 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -41,6 +41,14 @@
             
         </tr>
         </thead>
+        <!--  Show when particpant is not registered  -->
+        <tbody if="{participant_status === null}">
+            <tr class="center aligned ui yellow message">
+                <td colspan="100%">
+                    <em>You are not a participant of this competition. Please register in My Submissions tab to view the leaderboard.</em>
+                </td>
+            </tr>
+        </tbody>
         <!--  Show when particpant registration is pending  -->
         <tbody if="{participant_status === 'pending'}">
             <tr class="center aligned ui yellow message">