-
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
'Solution' #663
base: master
Are you sure you want to change the base?
'Solution' #663
Changes from all commits
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 |
---|---|---|
@@ -0,0 +1,47 @@ | ||
from django.db.models import QuerySet | ||
from django.http import HttpRequest | ||
from rest_framework import filters | ||
from rest_framework.viewsets import ModelViewSet | ||
|
||
from cinema.models import MovieSession, Movie | ||
|
||
|
||
class FilterMovieSessionByDateAndMovie(filters.BaseFilterBackend): | ||
def filter_queryset( | ||
self, request: HttpRequest, | ||
queryset: QuerySet[MovieSession], | ||
view: ModelViewSet | ||
) -> QuerySet[MovieSession]: | ||
date = request.query_params.get("date") | ||
movie = request.query_params.get("movie") | ||
|
||
if date: | ||
queryset = queryset.filter(show_time__date=date) | ||
if movie: | ||
queryset = queryset.filter(movie__id=movie) | ||
|
||
return queryset | ||
|
||
|
||
class FilterMovieViewSet(filters.BaseFilterBackend): | ||
def filter_queryset( | ||
self, request: HttpRequest, | ||
queryset: QuerySet[Movie], | ||
view: ModelViewSet | ||
): | ||
actors = request.query_params.get("actors") | ||
genres = request.query_params.get("genres") | ||
title = request.query_params.get("title") | ||
|
||
if actors: | ||
actor_ids = actors.split(",") | ||
queryset = queryset.filter(actors__id__in=actor_ids) | ||
|
||
if genres: | ||
genre_ids = genres.split(",") | ||
queryset = queryset.filter(genres__id__in=genre_ids) | ||
|
||
if title: | ||
queryset = queryset.filter(title__icontains=title) | ||
|
||
return queryset |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Generated by Django 4.1 on 2024-10-03 10:37 | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('cinema', '0004_alter_genre_name'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='actors', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.actor'), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.genre'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='cinema_hall', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='cinema.cinemahall'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='movie', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='cinema.movie'), | ||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Generated by Django 4.1 on 2024-10-03 10:39 | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('cinema', '0005_alter_movie_actors_alter_movie_genres_and_more'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='actors', | ||
field=models.ManyToManyField(to='cinema.actor'), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(to='cinema.genre'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='cinema_hall', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cinema.cinemahall'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='movie', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cinema.movie'), | ||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
from typing import Callable | ||
|
||
from django.core.exceptions import ValidationError | ||
from django.db import models | ||
from django.conf import settings | ||
|
@@ -64,7 +66,8 @@ def __str__(self): | |
class Order(models.Model): | ||
created_at = models.DateTimeField(auto_now_add=True) | ||
user = models.ForeignKey( | ||
settings.AUTH_USER_MODEL, on_delete=models.CASCADE | ||
settings.AUTH_USER_MODEL, | ||
on_delete=models.CASCADE | ||
) | ||
|
||
def __str__(self): | ||
|
@@ -76,42 +79,66 @@ class Meta: | |
|
||
class Ticket(models.Model): | ||
movie_session = models.ForeignKey( | ||
MovieSession, on_delete=models.CASCADE, related_name="tickets" | ||
MovieSession, | ||
on_delete=models.CASCADE, | ||
related_name="tickets" | ||
) | ||
order = models.ForeignKey( | ||
Order, on_delete=models.CASCADE, related_name="tickets" | ||
Order, | ||
on_delete=models.CASCADE, | ||
related_name="tickets" | ||
) | ||
row = models.IntegerField() | ||
seat = models.IntegerField() | ||
|
||
def clean(self): | ||
@staticmethod | ||
def ticket_validation( | ||
row: int, | ||
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. overindented |
||
seat: int, | ||
cinema_hall: CinemaHall, | ||
error_class: Callable | ||
) -> None: | ||
for ticket_attr_value, ticket_attr_name, cinema_hall_attr_name in [ | ||
(self.row, "row", "rows"), | ||
(self.seat, "seat", "seats_in_row"), | ||
(row, "row", "rows"), | ||
(seat, "seat", "seats_in_row"), | ||
]: | ||
count_attrs = getattr( | ||
self.movie_session.cinema_hall, cinema_hall_attr_name | ||
cinema_hall, cinema_hall_attr_name | ||
) | ||
if not (1 <= ticket_attr_value <= count_attrs): | ||
raise ValidationError( | ||
error_message = ( | ||
f"{ticket_attr_name} " | ||
f"number must be in available range: " | ||
f"(1, {cinema_hall_attr_name}): " | ||
f"(1, {count_attrs})" | ||
) | ||
raise error_class( | ||
{ | ||
ticket_attr_name: f"{ticket_attr_name} " | ||
f"number must be in available range: " | ||
f"(1, {cinema_hall_attr_name}): " | ||
f"(1, {count_attrs})" | ||
ticket_attr_name: error_message | ||
} | ||
) | ||
|
||
def clean(self): | ||
self.ticket_validation( | ||
self.row, | ||
self.seat, | ||
self.movie_session.cinema_hall, | ||
ValidationError | ||
) | ||
|
||
def save( | ||
self, | ||
force_insert=False, | ||
force_update=False, | ||
using=None, | ||
update_fields=None, | ||
self, | ||
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. overindented - check everywhere |
||
force_insert=False, | ||
force_update=False, | ||
using=None, | ||
update_fields=None, | ||
): | ||
self.full_clean() | ||
super(Ticket, self).save( | ||
force_insert, force_update, using, update_fields | ||
force_insert, | ||
force_update, | ||
using, | ||
update_fields | ||
) | ||
|
||
def __str__(self): | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,15 @@ | ||
from django.db import transaction | ||
from rest_framework import serializers | ||
|
||
from cinema.models import Genre, Actor, CinemaHall, Movie, MovieSession | ||
from cinema.models import ( | ||
Genre, | ||
Actor, | ||
CinemaHall, | ||
Movie, | ||
MovieSession, | ||
Order, | ||
Ticket | ||
) | ||
|
||
|
||
class GenreSerializer(serializers.ModelSerializer): | ||
|
@@ -29,10 +38,14 @@ class Meta: | |
|
||
class MovieListSerializer(MovieSerializer): | ||
genres = serializers.SlugRelatedField( | ||
many=True, read_only=True, slug_field="name" | ||
many=True, | ||
read_only=True, | ||
slug_field="name" | ||
) | ||
actors = serializers.SlugRelatedField( | ||
many=True, read_only=True, slug_field="full_name" | ||
many=True, | ||
read_only=True, | ||
slug_field="full_name" | ||
) | ||
|
||
|
||
|
@@ -54,11 +67,14 @@ class Meta: | |
class MovieSessionListSerializer(MovieSessionSerializer): | ||
movie_title = serializers.CharField(source="movie.title", read_only=True) | ||
cinema_hall_name = serializers.CharField( | ||
source="cinema_hall.name", read_only=True | ||
source="cinema_hall.name", | ||
read_only=True | ||
) | ||
cinema_hall_capacity = serializers.IntegerField( | ||
source="cinema_hall.capacity", read_only=True | ||
source="cinema_hall.capacity", | ||
read_only=True | ||
) | ||
tickets_available = serializers.IntegerField(read_only=True) | ||
|
||
class Meta: | ||
model = MovieSession | ||
|
@@ -68,13 +84,80 @@ class Meta: | |
"movie_title", | ||
"cinema_hall_name", | ||
"cinema_hall_capacity", | ||
"tickets_available" | ||
) | ||
|
||
|
||
class TicketTakenPlacesSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = Ticket | ||
fields = ["row", "seat"] | ||
|
||
|
||
class MovieSessionDetailSerializer(MovieSessionSerializer): | ||
movie = MovieListSerializer(many=False, read_only=True) | ||
cinema_hall = CinemaHallSerializer(many=False, read_only=True) | ||
taken_places = TicketTakenPlacesSerializer( | ||
many=True, | ||
read_only=True, | ||
source="tickets" | ||
) | ||
|
||
class Meta: | ||
model = MovieSession | ||
fields = ("id", "show_time", "movie", "cinema_hall") | ||
fields = ("id", "show_time", "movie", "cinema_hall", "taken_places") | ||
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 added field taken_places, but model doesn't have this fields. You need to got it from tickets |
||
|
||
|
||
class TicketSerializer(serializers.ModelSerializer): | ||
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 can inherit this from TicketPerformSerializer so you don't have to declare the same Meta class twice |
||
movie_session = MovieSessionListSerializer(read_only=True, many=False) | ||
|
||
class Meta: | ||
model = Ticket | ||
fields = ("id", "row", "seat", "movie_session") | ||
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. we don't need id here |
||
|
||
|
||
class TicketPerformSerializer(serializers.ModelSerializer): | ||
movie_session = serializers.PrimaryKeyRelatedField( | ||
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. i think this serializer in unnecessary here - we are just passing an id of movie session on ticket create. You will need movie_session nested serializer when you display a list of Orders instead |
||
queryset=MovieSession.objects.all() | ||
) | ||
|
||
class Meta: | ||
model = Ticket | ||
fields = ("id", "row", "seat", "movie_session") | ||
|
||
|
||
class OrderSerializer(serializers.ModelSerializer): | ||
tickets = TicketPerformSerializer( | ||
many=True, | ||
read_only=False, | ||
allow_empty=False | ||
) | ||
|
||
class Meta: | ||
model = Order | ||
fields = ("id", "tickets", "created_at") | ||
|
||
def create(self, validated_data): | ||
tickets_data = validated_data.pop("tickets") | ||
|
||
with transaction.atomic(): | ||
order = Order.objects.create(**validated_data) | ||
for ticket_data in tickets_data: | ||
Ticket.objects.create(order=order, **ticket_data) | ||
|
||
return order | ||
|
||
def validate(self, attrs): | ||
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. this validation logically belongs to Ticket serializer class |
||
data = super().validate(attrs) | ||
Ticket.ticket_validation( | ||
row=attrs["row"], | ||
seat=attrs["seat"], | ||
cinema_hall=attrs["movie_session"].cinema_hall, | ||
error_class=serializers.ValidationError | ||
) | ||
|
||
return data | ||
|
||
|
||
class OrderListSerializer(OrderSerializer): | ||
tickets = TicketSerializer(many=True, read_only=True) |
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.
Would make sense to split and convert elements into int type - to be sure that you are being passed a valid numeric string + this should be placed in a separate method so you don't repeat yourself