From 060195f53070a2e949ece7835ae8486ef9f45869 Mon Sep 17 00:00:00 2001 From: Arsen Date: Tue, 5 Nov 2024 19:33:00 +0200 Subject: [PATCH 1/4] Solution --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++ cinema/models.py | 26 ++++ cinema/serializers.py | 59 ++++++++- cinema/urls.py | 48 +++++++- cinema/views.py | 115 ++++++++++++++---- 5 files changed, 269 insertions(+), 26 deletions(-) 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..1c208e618 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2024-11-05 15:47 + +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=50)), + ('last_name', models.CharField(max_length=50)), + ], + ), + migrations.CreateModel( + name='CinemaHall', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50)), + ('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=50, unique=True)), + ], + ), + 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/models.py b/cinema/models.py index cc477513f..04cd753d0 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,9 +1,35 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=50) + last_name = models.CharField(max_length=50) + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=50, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=50) + 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() + actors = models.ManyToManyField(Actor) + genres = models.ManyToManyField(Genre) duration = models.IntegerField() def __str__(self): diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..06b5db9a4 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,12 +1,69 @@ from rest_framework import serializers +from rest_framework.validators import UniqueValidator -from cinema.models import Movie +from cinema.models import Movie, Genre, Actor, CinemaHall + + +class GenreSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField( + max_length=50, + required=True, + validators=[UniqueValidator(queryset=Genre.objects.all())] + ) + + 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 ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=50, required=True) + last_name = serializers.CharField(max_length=50, required=True) + + 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=50, required=True) + rows = serializers.IntegerField(required=True) + seats_in_row = serializers.IntegerField(required=True) + + 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 MovieSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) title = serializers.CharField(max_length=255) description = serializers.CharField() + actors = serializers.PrimaryKeyRelatedField(many=True, + queryset=Actor.objects.all()) + genres = serializers.PrimaryKeyRelatedField(many=True, + queryset=Genre.objects.all()) duration = serializers.IntegerField() def create(self, validated_data): diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..8950d249f 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,50 @@ -from django.urls import path +from django.urls import path, include +from rest_framework import routers -from cinema.views import movie_list, movie_detail + +from cinema.views import ( + MovieViewSet, + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallList, + CinemaHallDetail +) + + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet, basename="movie-list") + +movie_list = MovieViewSet.as_view( + actions={"get": "list", + "post": "create"} +) + +movie_detail = MovieViewSet.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("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/", CinemaHallList.as_view( + actions={"get": "list", "post": "create"} + ), name="cinema-hall-list"), + path("cinema-halls//", + CinemaHallDetail.as_view( + actions={"get": "retrieve", + "put": "update", + "patch": "partial_update", + "delete": "destroy"} + ), + name="cinema-hall-detail"), + path("", include(router.urls)), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..60f9ce824 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,118 @@ -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, Genre, CinemaHall +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: + genres = Genre.objects.all() + serializer = GenreSerializer(genres, 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: int) -> Genre: + return get_object_or_404(Genre, pk=pk) - if request.method == "GET": - serializer = MovieSerializer(movie) + def get(self, request, pk: int) -> Response: + serializer = GenreSerializer(self.get_object(pk=pk)) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) + def put(self, request, pk: int) -> Response: + serializer = GenreSerializer(self.get_object(pk=pk), + data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_200_OK) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk: int) -> Response: + serializer = GenreSerializer(self.get_object(pk=pk), + data=request.data, + partial=True) + if serializer.is_valid(): + serializer.save() + return Response(serializer.data, status=status.HTTP_200_OK) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk: int) -> Response: + self.get_object(pk=pk).delete() return Response(status=status.HTTP_204_NO_CONTENT) + + +class ActorList( + generics.GenericAPIView, + mixins.CreateModelMixin, + mixins.ListModelMixin, +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request, *args, **kwargs) -> Response: + return self.list(request, *args, **kwargs) + + def post(self, request, *args, **kwargs) -> Response: + return self.create(request, *args, **kwargs) + + +class ActorDetail( + generics.GenericAPIView, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + 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 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) + + +class CinemaHallList( + viewsets.GenericViewSet, + mixins.ListModelMixin, + mixins.CreateModelMixin, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class CinemaHallDetail( + viewsets.GenericViewSet, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer From 57e50ff2d1076c4cd72da1280304fb598988bc8f Mon Sep 17 00:00:00 2001 From: Arsen Date: Tue, 5 Nov 2024 20:02:16 +0200 Subject: [PATCH 2/4] Fixed error with many-to-many relations for actors and genres. Moved GenericViewSet on last position in CinemaHallList and CinemaHallDetail views --- cinema/serializers.py | 18 +++++++++++++++++- cinema/views.py | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 06b5db9a4..26d0a0c41 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -66,8 +66,24 @@ class MovieSerializer(serializers.Serializer): queryset=Genre.objects.all()) duration = serializers.IntegerField() + class Meta: + model = Movie + fields = ["id", + "title", + "description", + "duration", + "actors", + "genres"] + 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) diff --git a/cinema/views.py b/cinema/views.py index 60f9ce824..469ef4899 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -95,19 +95,19 @@ def delete(self, request, *args, **kwargs) -> Response: class CinemaHallList( - viewsets.GenericViewSet, mixins.ListModelMixin, mixins.CreateModelMixin, + viewsets.GenericViewSet, ): queryset = CinemaHall.objects.all() serializer_class = CinemaHallSerializer class CinemaHallDetail( - viewsets.GenericViewSet, mixins.RetrieveModelMixin, mixins.UpdateModelMixin, mixins.DestroyModelMixin, + viewsets.GenericViewSet, ): queryset = CinemaHall.objects.all() serializer_class = CinemaHallSerializer From 4a0c150cbbf21e2f0e7ff53e9e4046e140d70311 Mon Sep 17 00:00:00 2001 From: Arsen Date: Tue, 5 Nov 2024 20:20:10 +0200 Subject: [PATCH 3/4] Views CinemaHallList and CinemaHallDetail changed to one CinemaHallViewSet view --- cinema/urls.py | 9 +++------ cinema/views.py | 11 ++--------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index 8950d249f..1a6fdfc68 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,18 +1,15 @@ from django.urls import path, include from rest_framework import routers - from cinema.views import ( MovieViewSet, GenreList, GenreDetail, ActorList, ActorDetail, - CinemaHallList, - CinemaHallDetail + CinemaHallViewSet ) - router = routers.DefaultRouter() router.register("movies", MovieViewSet, basename="movie-list") @@ -33,11 +30,11 @@ 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/", CinemaHallList.as_view( + path("cinema-halls/", CinemaHallViewSet.as_view( actions={"get": "list", "post": "create"} ), name="cinema-hall-list"), path("cinema-halls//", - CinemaHallDetail.as_view( + CinemaHallViewSet.as_view( actions={"get": "retrieve", "put": "update", "patch": "partial_update", diff --git a/cinema/views.py b/cinema/views.py index 469ef4899..fc02125fe 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -94,20 +94,13 @@ def delete(self, request, *args, **kwargs) -> Response: return self.destroy(request, *args, **kwargs) -class CinemaHallList( +class CinemaHallViewSet( mixins.ListModelMixin, mixins.CreateModelMixin, - viewsets.GenericViewSet, -): - queryset = CinemaHall.objects.all() - serializer_class = CinemaHallSerializer - - -class CinemaHallDetail( mixins.RetrieveModelMixin, mixins.UpdateModelMixin, mixins.DestroyModelMixin, - viewsets.GenericViewSet, + viewsets.GenericViewSet ): queryset = CinemaHall.objects.all() serializer_class = CinemaHallSerializer From 22d9872a14fb6fb908e38927420c9bb70f3c1636 Mon Sep 17 00:00:00 2001 From: Arsen Date: Tue, 5 Nov 2024 20:24:04 +0200 Subject: [PATCH 4/4] Changed score in CinemaHall endpoints to underscore --- cinema/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index 1a6fdfc68..bdf527e30 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -30,10 +30,10 @@ 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/", CinemaHallViewSet.as_view( + path("cinema_halls/", CinemaHallViewSet.as_view( actions={"get": "list", "post": "create"} ), name="cinema-hall-list"), - path("cinema-halls//", + path("cinema_halls//", CinemaHallViewSet.as_view( actions={"get": "retrieve", "put": "update",