From eeab5add633e71262053b7f0a5620f444db83f23 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 10 May 2023 12:18:18 +0500 Subject: [PATCH 1/2] show compeittion in Benchmark Im running when user is collaborator --- src/apps/api/views/competitions.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py index ef90394a4..e41a13c97 100644 --- a/src/apps/api/views/competitions.py +++ b/src/apps/api/views/competitions.py @@ -35,6 +35,8 @@ from leaderboards.models import Leaderboard from utils.data import make_url_sassy from api.permissions import IsOrganizerOrCollaborator +import logging +logger = logging.getLogger() class CompetitionViewSet(ModelViewSet): @@ -56,7 +58,14 @@ def get_queryset(self): mine = self.request.query_params.get('mine', None) if mine: - qs = qs.filter(created_by=self.request.user) + # either competition is mine + # or + # I am one of the collaborator + qs = Competition.objects.filter( + (Q(created_by=self.request.user)) | + (Q(collaborators__in=[self.request.user])) + + ) participating_in = self.request.query_params.get('participating_in', None) From 05a73da33901bc8395d5534a5d7cea181fdf430e Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 10 May 2023 12:23:54 +0500 Subject: [PATCH 2/2] white space removed --- src/apps/api/views/competitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py index e41a13c97..a3d011233 100644 --- a/src/apps/api/views/competitions.py +++ b/src/apps/api/views/competitions.py @@ -58,7 +58,7 @@ def get_queryset(self): mine = self.request.query_params.get('mine', None) if mine: - # either competition is mine + # either competition is mine # or # I am one of the collaborator qs = Competition.objects.filter(