From 36079224cdc139b5fffe0eeee561bb34b92d42f0 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Tue, 19 Nov 2024 21:53:44 +0500
Subject: [PATCH 1/2] Removed num_entries becasue the count was slowing down
 the platform

---
 src/apps/api/views/competitions.py            | 20 +++++++++----------
 .../riot/competitions/detail/leaderboards.tag |  2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index fafe0f5db..c34eec48e 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -705,15 +705,15 @@ def get_leaderboard(self, request, pk):
             # - child submissions (submissions who has a parent i.e. parent field is not null)
             # - Failed submissions
             # - Cancelled submissions
-            num_entries = Submission.objects.filter(
-                Q(owner__username=submission['owner']) |
-                Q(parent__owner__username=submission['owner']),
-                phase=phase,
-            ).exclude(
-                Q(status=Submission.FAILED) |
-                Q(status=Submission.CANCELLED) |
-                Q(parent__isnull=False)
-            ).count()
+            # num_entries = Submission.objects.filter(
+            #     Q(owner__username=submission['owner']) |
+            #     Q(parent__owner__username=submission['owner']),
+            #     phase=phase,
+            # ).exclude(
+            #     Q(status=Submission.FAILED) |
+            #     Q(status=Submission.CANCELLED) |
+            #     Q(parent__isnull=False)
+            # ).count()
 
             submission_key = f"{submission['owner']}{submission['parent'] or submission['id']}"
 
@@ -737,7 +737,7 @@ def get_leaderboard(self, request, pk):
                     'fact_sheet_answers': submission['fact_sheet_answers'],
                     'slug_url': submission['slug_url'],
                     'organization': submission['organization'],
-                    'num_entries': num_entries,
+                    # 'num_entries': num_entries,
                     'created_when': submission['created_when']
                 })
             for score in submission['scores']:
diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index b004d5ce9..25cc1e99a 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -34,7 +34,6 @@
         <tr>
             <th class="center aligned">#</th>
             <th>Participant</th>
-            <th>Entries</th>
             <th>Date</th>
             <th>ID</th>
             <th each="{ column in filtered_columns }" colspan="1">{column.title}</th>
@@ -83,7 +82,6 @@
             </td>
             <td if="{submission.organization === null}"><a href="{submission.slug_url}">{ submission.owner }</a></td>
             <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
-            <td>{submission.num_entries}</td>
             <td>{ pretty_date(submission.created_when) }</td>
             <td>{submission.id}</td>
             <td each="{ column in filtered_columns }">

From de03cbfdcebf1cb75adae5d3bb870525281e7262 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Tue, 19 Nov 2024 22:09:27 +0500
Subject: [PATCH 2/2] fixed test

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

diff --git a/src/tests/functional/test_submissions.py b/src/tests/functional/test_submissions.py
index 3ee088ae0..6248ccaf2 100644
--- a/src/tests/functional/test_submissions.py
+++ b/src/tests/functional/test_submissions.py
@@ -74,7 +74,7 @@ def _run_submission_and_add_to_leaderboard(self, competition_zip_path, submissio
 
         # The leaderboard table lists our submission
         prediction_score = Submission.objects.get(pk=submission_id).scores.first().score
-        assert Decimal(self.find('leaderboards table tbody tr:nth-of-type(1) td:nth-of-type(6)').text) == round(Decimal(prediction_score), precision)
+        assert Decimal(self.find('leaderboards table tbody tr:nth-of-type(1) td:nth-of-type(5)').text) == round(Decimal(prediction_score), precision)
 
     def test_v15_iris_result_submission_end_to_end(self):
         self._run_submission_and_add_to_leaderboard('competition_15_iris.zip', 'submission_15_iris_result.zip', '======= Set 1 (Iris_test)', has_solutions=False, precision=4)