From af4e465337fb82f46f07b694a2a72f517f428dc0 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Thu, 19 Oct 2023 17:23:54 +0300 Subject: [PATCH 1/6] Add CinemaHall, Genre, Actor & complete Movie --- ...emahall_genre_movie_actors_movie_genres.py | 56 +++++++++++++++++++ cinema/models.py | 35 ++++++++++++ 2 files changed, 91 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..4a5cd505a --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,56 @@ +# Generated by Django 4.1 on 2023-10-19 14:22 + +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='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()), + ], + options={ + 'ordering': ['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, unique=True)), + ], + options={ + 'ordering': ['name'], + }, + ), + 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='movies', to='cinema.genre'), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..f1ee1918c 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -5,6 +5,41 @@ class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() duration = models.IntegerField() + actors = models.ManyToManyField("Actor", related_name="movies") + genres = models.ManyToManyField("Genre", related_name="movies") def __str__(self): return self.title + + +class Actor(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + + class Meta: + ordering = ["first_name", "last_name", ] + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + class Meta: + ordering = ["name", ] + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + rows = models.IntegerField() + seats_in_row = models.IntegerField() + + class Meta: + ordering = ["name", ] + + def __str__(self): + return self.name From 31e98f5f583570b33911d7f2443d8c68a0026a34 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Thu, 19 Oct 2023 17:42:16 +0300 Subject: [PATCH 2/6] Add serializers --- cinema/serializers.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..928e66b84 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,27 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Movie, Actor, Genre, CinemaHall class MovieSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - title = serializers.CharField(max_length=255) - description = serializers.CharField() - duration = serializers.IntegerField() + 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 ActorSerializer(serializers.ModelSerializer): + class Meta: + model = Actor + fields = "__all__" - instance.save() - return instance +class GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = "__all__" + + +class CinemaHallSerializer(serializers.ModelSerializer): + class Meta: + model = CinemaHall + fields = "__all__" From c6d07d44451068a976533e1f66fecfab942c8402 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Thu, 19 Oct 2023 18:28:44 +0300 Subject: [PATCH 3/6] Implement Genre & Actor views and urls --- cinema/urls.py | 13 ++++-- cinema/views.py | 108 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 88 insertions(+), 33 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..2f95bf7dc 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,17 @@ from django.urls import path -from cinema.views import movie_list, movie_detail +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, +) 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"), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..17d3b3b41 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,93 @@ -from rest_framework.decorators import api_view +from rest_framework import generics from rest_framework.response import Response from rest_framework import status +from rest_framework import mixins -from django.shortcuts import get_object_or_404 -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from django.shortcuts import get_object_or_404 +from rest_framework.views import APIView +from cinema.models import Movie, CinemaHall, Actor, Genre +from cinema.serializers import MovieSerializer, CinemaHallSerializer, ActorSerializer, GenreSerializer -@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 GenreList(APIView): + def get(self, request): + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) + return Response(serializer.data) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def post(self, request): + serializer = GenreSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data, status=status.HTTP_201_CREATED) -@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, id=pk) - if request.method == "GET": - serializer = MovieSerializer(movie) - return Response(serializer.data, status=status.HTTP_200_OK) + def get(self, request, pk): + serializer = GenreSerializer(self.get_object(pk)) + return Response(serializer.data) - 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 put(self, request, pk): + serializer = GenreSerializer( + self.get_object(pk), data=request.data + ) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk): + serializer = GenreSerializer( + self.get_object(pk), data=request.data, partial=True + ) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk): + self.get_object(pk).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) + From dab1dff1e471b3335799e14c4ab1868a92b6b125 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Thu, 19 Oct 2023 18:49:29 +0300 Subject: [PATCH 4/6] Implement CinemaHallViewSet & its urls --- cinema/urls.py | 21 ++++++++++++++++++++- cinema/views.py | 18 +++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index 2f95bf7dc..c4b3a8cec 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -4,14 +4,33 @@ GenreList, GenreDetail, ActorList, - ActorDetail, + ActorDetail, 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" + } +) + + urlpatterns = [ 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 17d3b3b41..4e0662a68 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,4 +1,4 @@ -from rest_framework import generics +from rest_framework import generics, viewsets from rest_framework.response import Response from rest_framework import status from rest_framework import mixins @@ -91,3 +91,19 @@ def patch(self, request, *args, **kwargs): def delete(self, request, *args, **kwargs): return self.destroy(request, *args, **kwargs) + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.CreateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + + + + From cf03334ff6681316c35ffabb1b3d3bfc10272a22 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Thu, 19 Oct 2023 19:05:07 +0300 Subject: [PATCH 5/6] Implement MovieViewSet & its router --- cinema/serializers.py | 12 ++++++++---- cinema/urls.py | 9 +++++++-- cinema/views.py | 6 +++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 928e66b84..600136859 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -3,10 +3,7 @@ from cinema.models import Movie, Actor, Genre, CinemaHall -class MovieSerializer(serializers.Serializer): - class Meta: - model = Movie - fields = "__all__" + class ActorSerializer(serializers.ModelSerializer): @@ -25,3 +22,10 @@ class CinemaHallSerializer(serializers.ModelSerializer): class Meta: model = CinemaHall fields = "__all__" + + +class MovieSerializer(serializers.ModelSerializer): + + class Meta: + model = Movie + fields = "__all__" diff --git a/cinema/urls.py b/cinema/urls.py index c4b3a8cec..a6cb41c36 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,11 @@ -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, + ActorDetail, CinemaHallViewSet, MovieViewSet, ) cinema_hall_list = CinemaHallViewSet.as_view( @@ -19,6 +20,9 @@ } ) +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) + urlpatterns = [ path("genres/", GenreList.as_view(), name="genre-list"), @@ -31,6 +35,7 @@ cinema_hall_detail, name="cinema-hall-detail" ), + path("", include(router.urls)) ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 4e0662a68..4bd29e17b 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -104,6 +104,6 @@ class CinemaHallViewSet( serializer_class = CinemaHallSerializer - - - +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer From 52fc50973a428b95623d93ad0007eebd51507780 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Thu, 19 Oct 2023 19:10:08 +0300 Subject: [PATCH 6/6] Fix minor bugs --- cinema/serializers.py | 5 +---- cinema/urls.py | 6 +++--- cinema/views.py | 7 ++++++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 600136859..e5d19a586 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -3,9 +3,6 @@ from cinema.models import Movie, Actor, Genre, CinemaHall - - - class ActorSerializer(serializers.ModelSerializer): class Meta: model = Actor @@ -28,4 +25,4 @@ class MovieSerializer(serializers.ModelSerializer): class Meta: model = Movie - fields = "__all__" + fields = ["title", "description", "duration"] diff --git a/cinema/urls.py b/cinema/urls.py index a6cb41c36..a77fc49c3 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -16,7 +16,7 @@ "get": "retrieve", "put": "update", "patch": "partial_update", - "delete": "destroy" + "delete": "destroy", } ) @@ -29,9 +29,9 @@ 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_list, name="cinema-hall-list"), path( - "cinema-halls//", + "cinema_halls//", cinema_hall_detail, name="cinema-hall-detail" ), diff --git a/cinema/views.py b/cinema/views.py index 4bd29e17b..b23fe497b 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -8,7 +8,12 @@ from rest_framework.views import APIView from cinema.models import Movie, CinemaHall, Actor, Genre -from cinema.serializers import MovieSerializer, CinemaHallSerializer, ActorSerializer, GenreSerializer +from cinema.serializers import ( + MovieSerializer, + CinemaHallSerializer, + ActorSerializer, + GenreSerializer +) class GenreList(APIView):