Merge pull request #2066 from codalab/fix-bestmodestrategy

Fix BestModeStrategy to exclude soft-deleted and non-finished submissions

Author: ObadaS

src/apps/leaderboards/strategies.py

@@ -84,7 +84,10 @@ def _choose_best_submission(self, leaderboard, owner, phase):
         primary_col = leaderboard.columns.get(index=leaderboard.primary_index)
         ordering = [f'{"-" if primary_col.sorting == "desc" else ""}primary_col']
 
-        submissions = Submission.objects.filter(phase=phase, owner=owner) \
+        submissions = Submission.objects.filter(phase=phase,
+                                                owner=owner,
+                                                is_soft_deleted=False,
+                                                status=Submission.FINISHED) \
             .select_related('owner').prefetch_related('scores') \
             .annotate(primary_col=Sum('scores__score', filter=Q(scores__column=primary_col)))