From 36ffeb327658d65a00b41e86f51e9fffcc1b7bb3 Mon Sep 17 00:00:00 2001 From: Oleksandr Taranenko Date: Tue, 24 Sep 2024 18:46:16 +0300 Subject: [PATCH 1/2] Solution --- ...ter_movie_options_movie_actors_and_more.py | 64 ++++++++++ .../0003_cinemahall_alter_genre_name.py | 35 ++++++ cinema/models.py | 35 ++++++ cinema/serializers.py | 40 ++++--- cinema/urls.py | 29 ++++- cinema/views.py | 112 +++++++++++++----- 6 files changed, 265 insertions(+), 50 deletions(-) create mode 100644 cinema/migrations/0002_actor_genre_alter_movie_options_movie_actors_and_more.py create mode 100644 cinema/migrations/0003_cinemahall_alter_genre_name.py diff --git a/cinema/migrations/0002_actor_genre_alter_movie_options_movie_actors_and_more.py b/cinema/migrations/0002_actor_genre_alter_movie_options_movie_actors_and_more.py new file mode 100644 index 000000000..0353f3296 --- /dev/null +++ b/cinema/migrations/0002_actor_genre_alter_movie_options_movie_actors_and_more.py @@ -0,0 +1,64 @@ +# Generated by Django 4.1 on 2024-09-24 14:43 + +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)), + ], + options={ + "ordering": ["first_name", "last_name"], + }, + ), + 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)), + ], + options={ + "ordering": ["name"], + }, + ), + migrations.AlterModelOptions( + name="movie", + options={"ordering": ["title"]}, + ), + migrations.AddField( + model_name="movie", + name="actors", + field=models.ManyToManyField(to="cinema.actor"), + ), + migrations.AddField( + model_name="movie", + name="genres", + field=models.ManyToManyField(to="cinema.genre"), + ), + ] diff --git a/cinema/migrations/0003_cinemahall_alter_genre_name.py b/cinema/migrations/0003_cinemahall_alter_genre_name.py new file mode 100644 index 000000000..2630a06ec --- /dev/null +++ b/cinema/migrations/0003_cinemahall_alter_genre_name.py @@ -0,0 +1,35 @@ +# Generated by Django 4.1 on 2024-09-24 14:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("cinema", "0002_actor_genre_alter_movie_options_movie_actors_and_more"), + ] + + operations = [ + 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.AlterField( + model_name="genre", + name="name", + field=models.CharField(max_length=255, unique=True), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..460593d1f 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,45 @@ from django.db import models +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + rows = models.IntegerField() + seats_in_row = models.IntegerField() + + def __str__(self): + return f"Hall: {self.name} - {self.rows} seats" + + class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() + actors = models.ManyToManyField("Actor") + genres = models.ManyToManyField("Genre") duration = models.IntegerField() def __str__(self): return self.title + + class Meta: + ordering = ["title"] + + +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 Meta: + ordering = ["first_name", "last_name"] + + +class Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return self.name + + class Meta: + ordering = ["name"] diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..d82844182 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,32 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import ( + Movie, + CinemaHall, + Actor, + Genre +) -class MovieSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - title = serializers.CharField(max_length=255) - description = serializers.CharField() - duration = serializers.IntegerField() +class MovieSerializer(serializers.ModelSerializer): + class Meta: + model = Movie + fields = "__all__" - def create(self, validated_data): - return Movie.objects.create(**validated_data) - 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) +class CinemaHallSerializer(serializers.ModelSerializer): + class Meta: + model = CinemaHall + fields = "__all__" - instance.save() - return instance +class ActorSerializer(serializers.ModelSerializer): + class Meta: + model = Actor + fields = "__all__" + + +class GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = "__all__" diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..25fc3d692 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,31 @@ -from django.urls import path +from django.urls import path, include +from rest_framework import routers + +from cinema.views import ( + MovieViewSet, + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallList, + CinemaHallDetail +) + + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) -from cinema.views import movie_list, movie_detail 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("cinemehalls/", CinemaHallList.as_view(), name="cinema-list"), + path("cinemehalls//", + CinemaHallDetail.as_view(), + name="cinema-detail"), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..1f1e87928 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,97 @@ -from rest_framework.decorators import api_view +from django.shortcuts import get_object_or_404 + from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, viewsets, generics, mixins +from rest_framework.views import APIView -from django.shortcuts import get_object_or_404 +from cinema.models import Movie, CinemaHall, Actor, Genre +from cinema.serializers import ( + MovieSerializer, + CinemaHallSerializer, + ActorSerializer, + GenreSerializer +) -from cinema.models import Movie -from cinema.serializers import MovieSerializer +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer -@api_view(["GET", "POST"]) -def movie_list(request): - if request.method == "GET": - movies = Movie.objects.all() - serializer = MovieSerializer(movies, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "POST": - serializer = MovieSerializer(data=request.data) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_201_CREATED) +class CinemaHallList(generics.ListAPIView): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class CinemaHallDetail(generics.RetrieveAPIView): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class ActorList( + mixins.ListModelMixin, + mixins.CreateModelMixin, + generics.GenericAPIView +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request, *args, **kwargs) -> Response: + return self.list(request, *args, **kwargs) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def post(self, request, *args, **kwargs) -> Response: + return self.create(request, *args, **kwargs) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) +class ActorDetail( + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + generics.GenericAPIView +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer - if request.method == "GET": - serializer = MovieSerializer(movie) + def get(self, request, *args, **kwargs) -> Response: + return self.retrieve(request, *args, **kwargs) + + def put(self, request, *args, **kwargs) -> Response: + return self.update(request, *args, **kwargs) + + def delete(self, request, *args, **kwargs) -> Response: + return self.destroy(request, *args, **kwargs) + + +class GenreList(APIView): + def get(self, request) -> Response: + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + def post(self, request) -> Response: + serializer = GenreSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data, status=status.HTTP_201_CREATED) + + +class GenreDetail(APIView): + def get_object(self, pk) -> Genre: + return get_object_or_404(Genre, pk=pk) + + def get(self, request, pk) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre) + return Response(serializer.data, status=status.HTTP_200_OK) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def put(self, request, pk) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk) -> Response: + genre = self.get_object(pk) + genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) From 8fab37de4fc51b50a42c89006197ea1182b5b308 Mon Sep 17 00:00:00 2001 From: Oleksandr Taranenko Date: Tue, 24 Sep 2024 19:31:07 +0300 Subject: [PATCH 2/2] fix --- cinema/serializers.py | 40 ++++++++++++++++++++++++++++++++++++---- cinema/urls.py | 28 ++++++++++++++++++++++------ cinema/views.py | 24 ++++++++++++++++++------ 3 files changed, 76 insertions(+), 16 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index d82844182..91e8463a5 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -8,10 +8,42 @@ ) -class MovieSerializer(serializers.ModelSerializer): - class Meta: - model = Movie - fields = "__all__" +class MovieSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + title = serializers.CharField(max_length=255) + description = serializers.CharField() + actors = serializers.PrimaryKeyRelatedField( + queryset=Actor.objects.all(), + many=True + ) + genres = serializers.PrimaryKeyRelatedField( + queryset=Genre.objects.all(), + many=True + ) + duration = serializers.IntegerField() + + def create(self, 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) + instance.description = validated_data.get( + "description", instance.description + ) + instance.duration = validated_data.get("duration", instance.duration) + if "actors" in validated_data: + actors_data = validated_data.pop("actors", []) + instance.actors.set(actors_data) + if "genres" in validated_data: + genres_data = validated_data.pop("genres", []) + instance.genres.set(genres_data) + instance.save() + return instance class CinemaHallSerializer(serializers.ModelSerializer): diff --git a/cinema/urls.py b/cinema/urls.py index 25fc3d692..1188472f5 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -7,10 +7,24 @@ GenreDetail, ActorList, ActorDetail, - CinemaHallList, - CinemaHallDetail + CinemaHallViewSet + ) +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", + } +) router = routers.DefaultRouter() router.register("movies", MovieViewSet) @@ -22,10 +36,12 @@ 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("cinemehalls/", CinemaHallList.as_view(), name="cinema-list"), - path("cinemehalls//", - CinemaHallDetail.as_view(), - name="cinema-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 1f1e87928..6a436da85 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -18,12 +18,14 @@ class MovieViewSet(viewsets.ModelViewSet): serializer_class = MovieSerializer -class CinemaHallList(generics.ListAPIView): - queryset = CinemaHall.objects.all() - serializer_class = CinemaHallSerializer - - -class CinemaHallDetail(generics.RetrieveAPIView): +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet, +): queryset = CinemaHall.objects.all() serializer_class = CinemaHallSerializer @@ -58,6 +60,9 @@ def get(self, request, *args, **kwargs) -> Response: def put(self, request, *args, **kwargs) -> Response: return self.update(request, *args, **kwargs) + def patch(self, request, *args, **kwargs) -> Response: + return self.partial_update(request, *args, **kwargs) + def delete(self, request, *args, **kwargs) -> Response: return self.destroy(request, *args, **kwargs) @@ -91,6 +96,13 @@ def put(self, request, pk) -> Response: serializer.save() return Response(serializer.data) + def patch(self, request, pk) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) + def delete(self, request, pk) -> Response: genre = self.get_object(pk) genre.delete()