-
Notifications
You must be signed in to change notification settings - Fork 636
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.
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
not solution, i need check because have a little problem with git #662
base: master
Are you sure you want to change the base?
Changes from all commits
b45e59e
caba914
d9a3338
8a55f44
2a575f6
d42ce62
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
ActorViewSet, | ||
CinemaHallViewSet, | ||
MovieViewSet, | ||
MovieSessionViewSet, | ||
MovieSessionViewSet, OrderViewSet, | ||
) | ||
|
||
router = routers.DefaultRouter() | ||
|
@@ -15,6 +15,7 @@ | |
router.register("cinema_halls", CinemaHallViewSet) | ||
router.register("movies", MovieViewSet) | ||
router.register("movie_sessions", MovieSessionViewSet) | ||
router.register("orders", OrderViewSet) | ||
|
||
urlpatterns = [path("", include(router.urls))] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You could simplify it to urlpatterns = router.urls |
||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
from datetime import datetime | ||
|
||
from django.db.models import F, Count | ||
from rest_framework import viewsets | ||
from rest_framework.pagination import PageNumberPagination | ||
|
||
from cinema.models import Genre, Actor, CinemaHall, Movie, MovieSession | ||
from cinema.models import Genre, Actor, CinemaHall, Movie, MovieSession, Order | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If importing more than two items, it is better to write them on separate lines. This improves readability and maintenance of the code. Example: From taxi.models import ( |
||
|
||
from cinema.serializers import ( | ||
GenreSerializer, | ||
|
@@ -12,6 +16,8 @@ | |
MovieDetailSerializer, | ||
MovieSessionDetailSerializer, | ||
MovieListSerializer, | ||
OrderSerializer, | ||
OrderListSerializer, | ||
) | ||
|
||
|
||
|
@@ -43,9 +49,40 @@ def get_serializer_class(self): | |
|
||
return MovieSerializer | ||
|
||
@staticmethod | ||
def _make_int_from_str(query): | ||
return [int(num) for num in query.split(",")] | ||
|
||
def get_queryset(self): | ||
query_set = self.queryset.prefetch_related("actors", "genres") | ||
title = self.request.query_params.get("title") | ||
genres = self.request.query_params.get("genres") | ||
actors = self.request.query_params.get("actors") | ||
|
||
if title: | ||
query_set = query_set.filter(title__icontains=title) | ||
|
||
if genres: | ||
genres_ids = self._make_int_from_str(genres) | ||
query_set = query_set.filter(genres__id__in=genres_ids) | ||
|
||
if actors: | ||
actors_ids = self._make_int_from_str(actors) | ||
query_set = query_set.filter(actors__id__in=actors_ids) | ||
|
||
return query_set.distinct() | ||
|
||
|
||
class MovieSessionViewSet(viewsets.ModelViewSet): | ||
queryset = MovieSession.objects.all() | ||
queryset = ( | ||
MovieSession.objects.all() | ||
.select_related("movie", "cinema_hall") | ||
.annotate( | ||
tickets_available=F("cinema_hall__rows") | ||
* F("cinema_hall__seats_in_row") | ||
- Count("tickets") - 1 | ||
) | ||
) | ||
serializer_class = MovieSessionSerializer | ||
|
||
def get_serializer_class(self): | ||
|
@@ -56,3 +93,40 @@ def get_serializer_class(self): | |
return MovieSessionDetailSerializer | ||
|
||
return MovieSessionSerializer | ||
|
||
def get_queryset(self): | ||
query_set = self.queryset | ||
movie = self.request.query_params.get("movie") | ||
date = self.request.query_params.get("date") | ||
if movie: | ||
movie_ids = int(movie) | ||
query_set = query_set.filter(movie__id=movie_ids) | ||
|
||
if date: | ||
date = datetime.strptime(date, "%Y-%m-%d").date() | ||
query_set = query_set.filter(show_time__date=date) | ||
|
||
return query_set | ||
|
||
|
||
class OrderPagination(PageNumberPagination): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. would be better structure to put pagination in a spearate file |
||
page_size = 10 | ||
page_size_query_param = "page_size" | ||
max_page_size = 100 | ||
|
||
|
||
class OrderViewSet(viewsets.ModelViewSet): | ||
queryset = Order.objects.select_related("user") | ||
serializer_class = OrderSerializer | ||
pagination_class = OrderPagination | ||
|
||
def get_queryset(self): | ||
return self.queryset.filter(user=self.request.user) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. N+1 problem not solved here |
||
|
||
def perform_create(self, serializer): | ||
serializer.save(user=self.request.user) | ||
|
||
def get_serializer_class(self): | ||
if self.action == "list": | ||
return OrderListSerializer | ||
return OrderSerializer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inconsistent. Just move to a new line.