Skip to content

Queues - show competitions using the queue - Update #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Didayolo merged 2 commits into from
Feb 10, 2024
Merged

Queues - show competitions using the queue - Update #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62358ae
public competitions page error fixed
ihsaan-ullah Feb 10, 2024
8f06015
code simplified
ihsaan-ullah Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/apps/api/serializers/queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class QueueSerializer(QueueOwnerMixin, serializers.ModelSerializer):
is_owner = serializers.SerializerMethodField()
owner = serializers.CharField(source='owner.username', read_only=True)
organizers = OrganizerSerializer(many=True, read_only=True)
competitions = serializers.SerializerMethodField()

class Meta:
model = Queue
Expand All @@ -75,7 +74,6 @@ class Meta:
'created_when',
'is_owner',
'id',
'competitions',
)
# This serializer is read only, basically..
read_only_fields = (
Expand All @@ -87,9 +85,15 @@ class Meta:
'broker_url',
'created_when',
'is_owner',
'competitions',
)


class QueueListSerializer(QueueSerializer):
competitions = serializers.SerializerMethodField()

class Meta(QueueSerializer.Meta):
fields = QueueSerializer.Meta.fields + ('competitions',)

def get_competitions(self, obj):
# get user from the context request
user = self.context['request'].user
Expand Down
4 changes: 2 additions & 2 deletions src/apps/api/views/queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class QueueViewSet(ModelViewSet):
queryset = Queue.objects.all()
serializer_class = serializers.QueueSerializer
serializer_class = serializers.QueueListSerializer
filter_fields = ('owner', 'is_public', 'name')
filter_backends = (DjangoFilterBackend, SearchFilter)
search_fields = ('name',)
Expand All @@ -29,7 +29,7 @@ def get_queryset(self):

def get_serializer_class(self):
if self.request.method == 'GET':
return serializers.QueueSerializer
return serializers.QueueListSerializer
else:
return serializers.QueueCreationSerializer

Expand Down