alex/voyage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiple adventures when shared with multiple users!

Browse Source
This commit is contained in:
Sean Morley
2024-09-27 22:14:34 -04:00
parent 7c5b448c64
commit c1664e82bf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/server/adventures/views.py
View File

@@ -72,23 +72,22 @@ class AdventureViewSet(viewsets.ModelViewSet):
return queryset.order_by(ordering) return queryset.order_by(ordering)
def get_queryset(self): def get_queryset(self):
# if the user is not authenticated return only public adventures for retrieve action # if the user is not authenticated return only public adventures for retrieve action
if not self.request.user.is_authenticated: if not self.request.user.is_authenticated:
if self.action == 'retrieve': if self.action == 'retrieve':
return Adventure.objects.filter(is_public=True) return Adventure.objects.filter(is_public=True).distinct()
return Adventure.objects.none() return Adventure.objects.none()
if self.action == 'retrieve': if self.action == 'retrieve':
# For individual adventure retrieval, include public adventures # For individual adventure retrieval, include public adventures
return Adventure.objects.filter( return Adventure.objects.filter(
Q(is_public=True) | Q(user_id=self.request.user.id) | Q(collection__shared_with=self.request.user) Q(is_public=True) | Q(user_id=self.request.user.id) | Q(collection__shared_with=self.request.user)
) ).distinct()
else: else:
# For other actions, include user's own adventures and shared adventures # For other actions, include user's own adventures and shared adventures
return Adventure.objects.filter( return Adventure.objects.filter(
Q(user_id=self.request.user.id) | Q(collection__shared_with=self.request.user) Q(user_id=self.request.user.id) | Q(collection__shared_with=self.request.user)
) ).distinct()
def retrieve(self, request, *args, **kwargs): def retrieve(self, request, *args, **kwargs):
queryset = self.get_queryset() queryset = self.get_queryset()
@@ -270,6 +269,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
serializer.save() serializer.save()
# when creating an adventure, make sure the user is the owner of the collection or shared with the collection # when creating an adventure, make sure the user is the owner of the collection or shared with the collection
@transaction.atomic
def perform_create(self, serializer): def perform_create(self, serializer):
# Retrieve the collection from the validated data # Retrieve the collection from the validated data
collection = serializer.validated_data.get('collection') collection = serializer.validated_data.get('collection')