From d66403078baf4abc2f9bf5526296e746adb7deea Mon Sep 17 00:00:00 2001 From: Vladyslav Shatrovskyi Date: Wed, 29 Nov 2023 17:51:46 +0200 Subject: [PATCH 1/4] Solution --- cinema/models.py | 26 ++++++++++ cinema/serializers.py | 87 +++++++++++++++++++++++++++++++- cinema/urls.py | 38 ++++++++++++-- cinema/views.py | 114 +++++++++++++++++++++++++++++++++--------- 4 files changed, 235 insertions(+), 30 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index cc477513f..db1266ac2 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,36 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + rows = models.IntegerField() + seats_in_row = models.IntegerField() + + def __str__(self): + return self.name + + class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() duration = models.IntegerField() + actors = models.ManyToManyField(to=Actor, related_name="movies") + genres = models.ManyToManyField(to=Genre, related_name="genres") def __str__(self): return self.title diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..6f62d6bed 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Movie, Actor, CinemaHall, Genre class MovieSerializer(serializers.Serializer): @@ -8,9 +8,24 @@ class MovieSerializer(serializers.Serializer): title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() + actors = serializers.PrimaryKeyRelatedField( + queryset=Actor.objects.all(), + many=True + ) + genres = serializers.PrimaryKeyRelatedField( + queryset=Genre.objects.all(), + many=True + ) def create(self, validated_data): - return Movie.objects.create(**validated_data) + actors_data = validated_data.pop("actors") + genres_data = validated_data.pop("genres") + + movie = Movie.objects.create(**validated_data) + + movie.actors.set(actors_data) + movie.genres.set(genres_data) + return movie def update(self, instance, validated_data): instance.title = validated_data.get("title", instance.title) @@ -19,6 +34,74 @@ def update(self, instance, validated_data): ) instance.duration = validated_data.get("duration", instance.duration) + actors_data = validated_data.get("actors") + genres_data = validated_data.get("genres") + + if actors_data: + instance.actors.set(actors_data) + if genres_data: + instance.genres.set(genres_data) + + instance.save() + + return instance + + +class ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=255) + last_name = serializers.CharField(max_length=255) + + def create(self, validated_data): + return Actor.objects.create(**validated_data) + + def update(self, instance, validated_data): + instance.first_name = validated_data.get( + "first_name", + instance.first_name + ) + instance.last_name = validated_data.get( + "last_name", + instance.last_name + ) + + instance.save() + + return instance + + +class CinemaHallSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + rows = serializers.IntegerField() + seats_in_row = serializers.IntegerField() + + def create(self, validated_data): + return CinemaHall.objects.create(**validated_data) + + def update(self, instance, validated_data): + instance.name = validated_data.get("name", instance.name) + instance.rows = validated_data.get("rows", instance.rows) + instance.seats_in_row = validated_data.get( + "seats_in_row", + instance.seats_in_row + ) + + instance.save() + + return instance + + +class GenreSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + + def create(self, validated_data): + return Genre.objects.create(**validated_data) + + def update(self, instance, validated_data): + instance.name = validated_data.get("name", instance.name) + instance.save() return instance diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..9a46ac9d0 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,40 @@ -from django.urls import path +from django.urls import path, include +from rest_framework import routers +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet +) -from cinema.views import movie_list, movie_detail + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) +cinema_hall_list = CinemaHallViewSet.as_view(actions={ + "get": "list", + "post": "create", +}) +cinema_hall_detail = CinemaHallViewSet.as_view(actions={ + "get": "retrieve", + "put": "update", + "patch": "partial_update", + "delete": "destroy", +}) urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), + path("", include(router.urls)), + path("genres/", GenreList.as_view(), name="genre-list"), + path("genres//", GenreDetail.as_view(), name="genre-detail"), + path("actors/", ActorList.as_view(), name="actor-list"), + path("actors//", ActorDetail.as_view(), name="actor-detail"), + path("cinema_halls/", cinema_hall_list, name="cinema-hall-list"), + path( + "cinema_halls//", + cinema_hall_detail, + name="cinema-hall-detail" + ) ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..33efe085e 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,111 @@ -from rest_framework.decorators import api_view from rest_framework.response import Response -from rest_framework import status - +from rest_framework import status, generics, mixins, viewsets +from rest_framework.views import APIView from django.shortcuts import get_object_or_404 - -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from cinema.models import Movie, Actor, CinemaHall, Genre +from cinema.serializers import ( + MovieSerializer, + ActorSerializer, + GenreSerializer, + CinemaHallSerializer +) -@api_view(["GET", "POST"]) -def movie_list(request): - if request.method == "GET": - movies = Movie.objects.all() - serializer = MovieSerializer(movies, many=True) +class GenreList(APIView): + def get(self, request) -> Response: + genre = Genre.objects.all() + serializer = GenreSerializer(genre, many=True) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "POST": - serializer = MovieSerializer(data=request.data) + def post(self, request) -> Response: + serializer = GenreSerializer(data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) +class GenreDetail(APIView): + def get_object(self, pk): + return get_object_or_404(Genre, pk=pk) - if request.method == "GET": - serializer = MovieSerializer(movie) + def get(self, request, pk) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) + def put(self, request, pk): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) if serializer.is_valid(): serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(serializer.data) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data, partial=True) + if serializer.is_valid(): + serializer.save() + return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk): + genre = self.get_object(pk) + genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) + + +class ActorList( + mixins.ListModelMixin, + mixins.CreateModelMixin, + generics.GenericAPIView +): + + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request, *args, **kwargs): + return self.list(request, *args, **kwargs) + + def post(self, request, *args, **kwargs): + return self.create(request, *args, **kwargs) + + +class ActorDetail( + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + generics.GenericAPIView +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request, *args, **kwargs): + return self.retrieve(request, *args, **kwargs) + + def put(self, request, *args, **kwargs): + return self.update(request, *args, **kwargs) + + def patch(self, request, *args, **kwargs): + return self.partial_update(request, *args, **kwargs) + + def delete(self, request, *args, **kwargs): + return self.destroy(request, *args, **kwargs) + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer From a7c0922e86364d802fe3b99f96485e4efd2a7df2 Mon Sep 17 00:00:00 2001 From: Vladyslav Shatrovskyi Date: Wed, 29 Nov 2023 17:57:26 +0200 Subject: [PATCH 2/4] add migrations --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py diff --git a/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py new file mode 100644 index 000000000..04e1af801 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2023-11-29 13:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cinema', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Actor', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ], + ), + migrations.CreateModel( + name='CinemaHall', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('rows', models.IntegerField()), + ('seats_in_row', models.IntegerField()), + ], + ), + migrations.CreateModel( + name='Genre', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, unique=True)), + ], + ), + migrations.AddField( + model_name='movie', + name='actors', + field=models.ManyToManyField(related_name='movies', to='cinema.actor'), + ), + migrations.AddField( + model_name='movie', + name='genres', + field=models.ManyToManyField(related_name='genres', to='cinema.genre'), + ), + ] From 40cae1c09083443b0d2cff6bfe3312417f9b968b Mon Sep 17 00:00:00 2001 From: Vladyslav Shatrovskyi Date: Wed, 29 Nov 2023 21:31:31 +0200 Subject: [PATCH 3/4] Improved Solution --- cinema/serializers.py | 111 +++++++----------------------------------- 1 file changed, 18 insertions(+), 93 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 6f62d6bed..5fe041e9d 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -3,105 +3,30 @@ from cinema.models import Movie, Actor, CinemaHall, Genre -class MovieSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - title = serializers.CharField(max_length=255) - description = serializers.CharField() - duration = serializers.IntegerField() - actors = serializers.PrimaryKeyRelatedField( - queryset=Actor.objects.all(), - many=True - ) - genres = serializers.PrimaryKeyRelatedField( - queryset=Genre.objects.all(), - many=True - ) +class MovieSerializer(serializers.ModelSerializer): + class Meta: + model = Movie + fields = [ + "title", "description", "duration" + ] - def create(self, validated_data): - actors_data = validated_data.pop("actors") - genres_data = validated_data.pop("genres") - movie = Movie.objects.create(**validated_data) +class ActorSerializer(serializers.ModelSerializer): - movie.actors.set(actors_data) - movie.genres.set(genres_data) - return movie + class Meta: + model = Actor + fields = "__all__" - def update(self, instance, validated_data): - instance.title = validated_data.get("title", instance.title) - instance.description = validated_data.get( - "description", instance.description - ) - instance.duration = validated_data.get("duration", instance.duration) - actors_data = validated_data.get("actors") - genres_data = validated_data.get("genres") +class CinemaHallSerializer(serializers.ModelSerializer): - if actors_data: - instance.actors.set(actors_data) - if genres_data: - instance.genres.set(genres_data) + class Meta: + model = CinemaHall + fields = "__all__" - instance.save() - return instance +class GenreSerializer(serializers.ModelSerializer): - -class ActorSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - first_name = serializers.CharField(max_length=255) - last_name = serializers.CharField(max_length=255) - - def create(self, validated_data): - return Actor.objects.create(**validated_data) - - def update(self, instance, validated_data): - instance.first_name = validated_data.get( - "first_name", - instance.first_name - ) - instance.last_name = validated_data.get( - "last_name", - instance.last_name - ) - - instance.save() - - return instance - - -class CinemaHallSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - name = serializers.CharField(max_length=255) - rows = serializers.IntegerField() - seats_in_row = serializers.IntegerField() - - def create(self, validated_data): - return CinemaHall.objects.create(**validated_data) - - def update(self, instance, validated_data): - instance.name = validated_data.get("name", instance.name) - instance.rows = validated_data.get("rows", instance.rows) - instance.seats_in_row = validated_data.get( - "seats_in_row", - instance.seats_in_row - ) - - instance.save() - - return instance - - -class GenreSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - name = serializers.CharField(max_length=255) - - def create(self, validated_data): - return Genre.objects.create(**validated_data) - - def update(self, instance, validated_data): - instance.name = validated_data.get("name", instance.name) - - instance.save() - - return instance + class Meta: + model = Genre + fields = "__all__" From e542229a73aaca4e0388959a063b8255a87fd905 Mon Sep 17 00:00:00 2001 From: Vladyslav Shatrovskyi Date: Wed, 29 Nov 2023 21:32:01 +0200 Subject: [PATCH 4/4] Improved Solution --- cinema/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cinema/serializers.py b/cinema/serializers.py index 5fe041e9d..4b531e654 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -4,6 +4,7 @@ class MovieSerializer(serializers.ModelSerializer): + class Meta: model = Movie fields = [