From d6499b5e5e46689756ec59cca98a7c700c7d6b3e Mon Sep 17 00:00:00 2001 From: alexpanzhar Date: Tue, 5 Nov 2024 15:28:01 +0100 Subject: [PATCH 1/5] feat: Create Genre, Actor, CinemaHall models and update Movie model --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++++++++++++++ cinema/models.py | 24 ++++++++++ 2 files changed, 71 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..74c27b1e5 --- /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 14:27 + +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='movies', to='cinema.genre'), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..3b64d817d 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -5,6 +5,30 @@ 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 Genre(models.Model): + name = models.CharField( + max_length=255, + unique=True + ) + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + rows = models.IntegerField() + seats_in_row = models.IntegerField() From c8b393b00c939b8527bc6102e32a31c937987bf8 Mon Sep 17 00:00:00 2001 From: alexpanzhar Date: Tue, 5 Nov 2024 15:51:48 +0100 Subject: [PATCH 2/5] chore: add __str__ to Actor, Genre, CinemaHall models --- cinema/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cinema/models.py b/cinema/models.py index 3b64d817d..1c3457354 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -20,6 +20,9 @@ class Actor(models.Model): first_name = models.CharField(max_length=255) last_name = models.CharField(max_length=255) + def __str__(self): + return f"Actor: {self.first_name} {self.last_name}" + class Genre(models.Model): name = models.CharField( @@ -27,8 +30,14 @@ class Genre(models.Model): unique=True ) + def __str__(self): + return f"Genre: {self.name}" + class CinemaHall(models.Model): name = models.CharField(max_length=255) rows = models.IntegerField() seats_in_row = models.IntegerField() + + def __str__(self): + return f"CinemaHall: {self.name}" From e52eea6c78d59c28d82d9c55bfc0abc24f6e099b Mon Sep 17 00:00:00 2001 From: alexpanzhar Date: Tue, 5 Nov 2024 15:52:55 +0100 Subject: [PATCH 3/5] feat: Create serializers for Actor, Genre, CinemaHall models --- cinema/serializers.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..0430f2c7b 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -22,3 +22,21 @@ def update(self, instance, validated_data): instance.save() return instance + + +class ActorSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=255) + last_name = serializers.CharField(max_length=255) + + +class GenreSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + + +class CinemaHallSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + rows = serializers.IntegerField() + seats_in_row = serializers.IntegerField() From 89bd4f5ff74bea52ce6c2a6bcb15067ceab53735 Mon Sep 17 00:00:00 2001 From: alexpanzhar Date: Tue, 5 Nov 2024 17:34:34 +0100 Subject: [PATCH 4/5] fix: update serializers.py --- cinema/serializers.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 0430f2c7b..a61682183 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): @@ -25,18 +25,16 @@ def update(self, instance, validated_data): class ActorSerializer(serializers.ModelSerializer): - id = serializers.IntegerField(read_only=True) - first_name = serializers.CharField(max_length=255) - last_name = serializers.CharField(max_length=255) + class Meta: + model = Actor + fields = ("id", "first_name", "last_name") class GenreSerializer(serializers.ModelSerializer): - id = serializers.IntegerField(read_only=True) - name = serializers.CharField(max_length=255) + model = Genre + fields = ("id", "name") class CinemaHallSerializer(serializers.ModelSerializer): - id = serializers.IntegerField(read_only=True) - name = serializers.CharField(max_length=255) - rows = serializers.IntegerField() - seats_in_row = serializers.IntegerField() + model = CinemaHall + fields = ("id", "name", "rows", "seats_in_row") From df542cb803f12b3ce4599eeec3d23b90134aee37 Mon Sep 17 00:00:00 2001 From: alexpanzhar Date: Tue, 5 Nov 2024 18:29:22 +0100 Subject: [PATCH 5/5] Solution --- cinema/serializers.py | 10 ++-- cinema/urls.py | 41 ++++++++++++-- cinema/views.py | 124 ++++++++++++++++++++++++++++++++---------- 3 files changed, 137 insertions(+), 38 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index a61682183..c27251f40 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -31,10 +31,12 @@ class Meta: class GenreSerializer(serializers.ModelSerializer): - model = Genre - fields = ("id", "name") + class Meta: + model = Genre + fields = ("id", "name") class CinemaHallSerializer(serializers.ModelSerializer): - model = CinemaHall - fields = ("id", "name", "rows", "seats_in_row") + class Meta: + model = CinemaHall + fields = ("id", "name", "rows", "seats_in_row") diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..8bd64b951 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,43 @@ -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, + 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) 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..4e63e76d4 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,109 @@ -from rest_framework.decorators import api_view +from rest_framework import status, mixins, generics +from rest_framework import viewsets +from rest_framework.generics import get_object_or_404 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, Actor, Genre, CinemaHall +from cinema.serializers import ( + MovieSerializer, + ActorSerializer, + GenreSerializer, + CinemaHallSerializer +) -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 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.update(request, *args, **kwargs, partial=True) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def delete(self, request, *args, **kwargs): + return self.destroy(request, *args, **kwargs) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) +class GenreList(APIView): + def get(self, request): + genre = Genre.objects.all() + serializer = GenreSerializer(genre, many=True) + return Response(serializer.data, status=status.HTTP_200_OK) + + 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) + + +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) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + def put(self, request, pk): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) + serializer.is_valid(raise_exception=True) + 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): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data, partial=True) + serializer.is_valid(raise_exception=True) + 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) + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer