Skip to content

Maxwell/minor issues #50

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

Open
maxwell1231 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Maxwell/minor issues #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa580b
Minor issue regarding blocked users not being defined
maxwell1231 Dec 3, 2023
11b6095
Merge branch 'master' into maxwell/minor-issues
maxwell1231 Dec 3, 2023
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
8 changes: 5 additions & 3 deletions src/ride/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ class RidesView(generics.GenericAPIView):

def get(self, request):
"""Get all rides in the future from unblocked users."""
blocked_users = request.user.person.blocked_users.all()
return success_response(
self.serializer_class(Ride.objects.filter(departure_datetime__gt=timezone.now(), archived=False).exclude(creator__in=blocked_users), many=True).data
self.serializer_class(Ride.objects.filter(departure_datetime__gt=timezone.now(), archived=False
).exclude(creator__in=blocked_users), many=True).data
)

def post(self, request):
Expand All @@ -36,7 +38,7 @@ def post(self, request):
except json.JSONDecodeError:
data = request.data
return CreateRideController(request, data, self.serializer_class).process()


class RidesArchiveView(generics.GenericAPIView):
serializer_class = RideSerializer
Expand Down Expand Up @@ -111,7 +113,7 @@ def get(self, request, id, token):

return PriceController(data, self.serializer_class).process()


class RecentView(generics.GenericAPIView):
serializer_class = SimpleRideSerializer

Expand Down