From 6d5bfd4fabe549978f791c1b8f61e4fd78c342e5 Mon Sep 17 00:00:00 2001 From: Yeva Date: Tue, 10 Oct 2023 16:04:30 +0300 Subject: [PATCH 1/4] Solution --- ...emahall_genre_movie_actors_movie_genres.py | 71 +++++++++++ cinema/models.py | 26 ++++ cinema/serializers.py | 58 ++++++++- cinema/urls.py | 25 +++- cinema/views.py | 114 ++++++++++++++---- 5 files changed, 265 insertions(+), 29 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..2ddd2b137 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,71 @@ +# Generated by Django 4.1.7 on 2023-10-09 13:39 + +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=64)), + ("last_name", models.CharField(max_length=64)), + ], + ), + migrations.CreateModel( + name="CinemaHall", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=64)), + ("rows", models.PositiveIntegerField()), + ("seats_in_row", models.PositiveIntegerField()), + ], + ), + migrations.CreateModel( + name="Genre", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=64, unique=True)), + ], + ), + migrations.AddField( + model_name="movie", + name="actors", + field=models.ManyToManyField(related_name="actors", to="cinema.actor"), + ), + migrations.AddField( + model_name="movie", + name="genres", + field=models.ManyToManyField(related_name="genres", to="cinema.genre"), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..77c95eada 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=64) + last_name = models.CharField(max_length=64) + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=64, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=64) + rows = models.PositiveIntegerField() + seats_in_row = models.PositiveIntegerField() + + 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(Actor, related_name="actors") + genres = models.ManyToManyField(Genre, related_name="genres") def __str__(self): return self.title diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..54b0474c3 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, Genre, CinemaHall class MovieSerializer(serializers.Serializer): @@ -18,6 +18,62 @@ def update(self, instance, validated_data): "description", instance.description ) instance.duration = validated_data.get("duration", instance.duration) + instance.save() + + return instance + + +class ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField() + last_name = serializers.CharField() + + 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 GenreSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=64) + + 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 CinemaHallSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=64) + 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() diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..a7c2dba57 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,27 @@ -from django.urls import path +from django.urls import path, include + +from rest_framework import routers + +from cinema.views import ( + MovieViewSet, + ActorList, + ActorDetail, + CinemaHallViewSet, + GenreList, + GenreDetail, +) + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) +router.register("cinema_halls", CinemaHallViewSet) -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"), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..2b96019e9 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,111 @@ -from rest_framework.decorators import api_view +from django.shortcuts import get_object_or_404 +from rest_framework import status, viewsets, mixins, generics from rest_framework.response import Response -from rest_framework import status +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, +) + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet, +): + 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): + 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 -from cinema.models import Movie -from cinema.serializers import MovieSerializer + def get(self, request, *args, **kwargs): + return self.retrieve(request, *args, **kwargs) + def put(self, request, *args, **kwargs): + return self.update(request, *args, **kwargs) -@api_view(["GET", "POST"]) -def movie_list(request): - if request.method == "GET": - movies = Movie.objects.all() - serializer = MovieSerializer(movies, many=True) + 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 GenreList(APIView): + def get(self, request): + 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): + 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): + 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) + return Response(serializer.data, 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, status=status.HTTP_200_OK) - 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) From ce29a140ff98448eb10449470aae39ffcaa8580c Mon Sep 17 00:00:00 2001 From: Yeva Date: Tue, 10 Oct 2023 16:07:41 +0300 Subject: [PATCH 2/4] Fixed related name --- cinema/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index 77c95eada..2e1714115 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -29,8 +29,8 @@ class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() duration = models.IntegerField() - actors = models.ManyToManyField(Actor, related_name="actors") - genres = models.ManyToManyField(Genre, related_name="genres") + actors = models.ManyToManyField(Actor, related_name="movies") + genres = models.ManyToManyField(Genre, related_name="movies") def __str__(self): return self.title From 1422aa7574b222771e7cef087af710ea395fd217 Mon Sep 17 00:00:00 2001 From: Yeva Date: Tue, 10 Oct 2023 16:10:32 +0300 Subject: [PATCH 3/4] Fixed from router to list CinemaHall --- cinema/urls.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/cinema/urls.py b/cinema/urls.py index a7c2dba57..b92cae7eb 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -11,9 +11,23 @@ GenreDetail, ) +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) -router.register("cinema_halls", CinemaHallViewSet) urlpatterns = [ @@ -22,6 +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("cinema_halls/", cinema_hall_list, name="cinema-halls-list"), + path( + "cinema_halls//", + cinema_hall_detail, + name="cinema-halls-detail" + ) ] app_name = "cinema" From 6e4178ec72f8e617476f3f3a2cf5ad7a6a8e39f7 Mon Sep 17 00:00:00 2001 From: Yeva Date: Tue, 10 Oct 2023 18:32:55 +0300 Subject: [PATCH 4/4] Added return invalid patch, added status 200 --- cinema/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cinema/views.py b/cinema/views.py index 2b96019e9..869c9227f 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -94,9 +94,9 @@ def put(self, request, pk): if serializer.is_valid(): serializer.save() - return Response(serializer.data) + return Response(serializer.data, status=status.HTTP_200_OK) - return Response(serializer.data, status=status.HTTP_400_BAD_REQUEST) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) def patch(self, request, pk): genre = self.get_object(pk) @@ -104,6 +104,7 @@ def patch(self, request, pk): 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 delete(self, request, pk): genre = self.get_object(pk)