Skip to content

Commit

Permalink
Fix: List queryset not bringing concatenated results
Browse files Browse the repository at this point in the history
  • Loading branch information
zMardone committed Dec 13, 2023
1 parent 1af0411 commit 1f7c7d9
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions bothub/api/v2/repository/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,6 @@ def get_queryset(self, *args, **kwargs):
integrated_repositories = self.queryset.filter(
project_intelligences__project=project
)

combined_queryset = integrated_repositories

if not owner_id and not nickname:
Expand All @@ -998,11 +997,27 @@ def get_queryset(self, *args, **kwargs):
if queryset_owner.exists():
combined_queryset = combined_queryset.union(queryset_owner)

if owner_id:
queryset_owner = self.queryset.filter(owner__id=owner_id)

if queryset_owner.exists():
combined_queryset = combined_queryset.union(queryset_owner)

if combined_queryset:
return combined_queryset.distinct()
return combined_queryset
else:
return super().get_queryset()

def list(self, request, *args, **kwargs):
queryset = self.get_queryset()
page = self.paginate_queryset(queryset)
if page is not None:
serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)

serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)


class RepositoriesPermissionsViewSet(mixins.ListModelMixin, GenericViewSet):
"""
Expand Down

0 comments on commit 1f7c7d9

Please sign in to comment.