From 36079224cdc139b5fffe0eeee561bb34b92d42f0 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Tue, 19 Nov 2024 21:53:44 +0500 Subject: [PATCH 1/3] 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 @@ # Participant - Entries Date ID {column.title} @@ -83,7 +82,6 @@ { submission.owner } { submission.organization.name } - {submission.num_entries} { pretty_date(submission.created_when) } {submission.id} From 9318deee3ed94ecf30341fc2e0f41c264414b2f5 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 5 Jul 2025 20:23:18 +0500 Subject: [PATCH 2/3] num entries completely removed --- src/apps/api/views/competitions.py | 16 ---------------- .../riot/competitions/detail/leaderboards.tag | 2 -- 2 files changed, 18 deletions(-) diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py index 38415e901..172048927 100644 --- a/src/apps/api/views/competitions.py +++ b/src/apps/api/views/competitions.py @@ -748,21 +748,6 @@ def get_leaderboard(self, request, pk): submissions_keys = {} submission_detailed_results = {} for submission in query['submissions']: - # count number of entries/number of submissions for the owner of this submission for this phase - # count all submissions except: - # - child submissions (submissions who has a parent i.e. parent field is not null) - # - Failed submissions - # - Cancelled submissions - num_entries = 1 # TMP, remove counting - # 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']}" @@ -786,7 +771,6 @@ 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, '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 @@ # Participant - Entries Date ID {column.title} @@ -83,7 +82,6 @@ { submission.owner } { submission.organization.name } - {submission.num_entries} { pretty_date(submission.created_when) } {submission.id} From 4c95787124cfe91e0cc08ba4e79fe98706771635 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 5 Jul 2025 20:50:08 +0500 Subject: [PATCH 3/3] test updated --- 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)