From 1bffa1550194569d231615631ad39a0526d9fd30 Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 13:37:30 +0200 Subject: [PATCH 1/8] Solution --- cinema/models.py | 25 ++++++++++++ cinema/serializers.py | 38 ++++++++++-------- cinema/urls.py | 17 +++++++-- cinema/views.py | 89 +++++++++++++++++++++++++++++-------------- 4 files changed, 121 insertions(+), 48 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index cc477513f..3e2a829cd 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,9 +1,34 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=100) + last_name = models.CharField(max_length=100) + + def __str__(self): + return self.first_name + + +class Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + 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, related_name="movies") + genres = models.ManyToManyField(Genre, related_name="movies") duration = models.IntegerField() def __str__(self): diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..a9eeced5d 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,30 @@ 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 MovieSerializer(serializers.ModelSerializer): + class Meta: + model = Movie + fields = "__all__" + read_only_fields = ["id"] - 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__" + read_only_fields = ["id"] - instance.save() - return instance +class GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = "__all__" + read_only_fields = ["id"] + +class CinemaHallSerializer(serializers.ModelSerializer): + class Meta: + model = CinemaHall + fields = "__all__" + read_only_fields = ["id"] \ No newline at end of file diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..116f10af4 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,19 @@ -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 GenreList, GenreDetail, ActorList, ActorDetail, CinemaHallViewSet, MovieViewSet + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) +router.register("cinema-halls", CinemaHallViewSet) 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="actors-list"), + path("actors//", ActorDetail.as_view(), name="actors-detail"), + path("", include(router.urls)), + ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..64e9e6f95 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,78 @@ -from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework import status +from rest_framework.views import APIView +from rest_framework import generics, mixins, viewsets from django.shortcuts import get_object_or_404 -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from cinema.models import Movie, Genre, Actor, CinemaHall +from cinema.serializers import MovieSerializer, GenreSerializer, ActorSerializer, 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): + genre = Genre.objects.all() + serializer = GenreSerializer(genre, 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) + 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) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) +class GenreDetail(APIView): + def get_object(self, pk): + return get_object_or_404(Genre, pk=pk) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, 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) - 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) - 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 ActorList(generics.ListCreateAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + +class ActorDetail(generics.RetrieveUpdateDestroyAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + +class CinemaHallViewSet( + viewsets.GenericViewSet, + mixins.ListModelMixin, + mixins.CreateModelMixin, + 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 d1508e652e624d111c44552e962a1917b72bb29d Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 13:40:39 +0200 Subject: [PATCH 2/8] add migration file and add blank line in serializers file --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++++++++++++++ cinema/serializers.py | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) 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..f06d9747c --- /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-12-07 08:59 + +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=100)), + ('last_name', models.CharField(max_length=100)), + ], + ), + 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/serializers.py b/cinema/serializers.py index a9eeced5d..ceebfa13d 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -27,4 +27,4 @@ class CinemaHallSerializer(serializers.ModelSerializer): class Meta: model = CinemaHall fields = "__all__" - read_only_fields = ["id"] \ No newline at end of file + read_only_fields = ["id"] From 24a23059d3446e24811325774d1c53fd0b739dbf Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 13:42:24 +0200 Subject: [PATCH 3/8] fix fleke8 err E501 --- cinema/urls.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cinema/urls.py b/cinema/urls.py index 116f10af4..d01b7fcff 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,7 +1,14 @@ from django.urls import path, include from rest_framework import routers -from cinema.views import GenreList, GenreDetail, ActorList, ActorDetail, CinemaHallViewSet, MovieViewSet +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet +) router = routers.DefaultRouter() router.register("movies", MovieViewSet) From b09fd43e93eea78daa98553e0222e65858261ca6 Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 13:43:52 +0200 Subject: [PATCH 4/8] fix fleke8 --- cinema/models.py | 1 + cinema/serializers.py | 1 + 2 files changed, 2 insertions(+) diff --git a/cinema/models.py b/cinema/models.py index 3e2a829cd..f62c53f0a 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -24,6 +24,7 @@ class CinemaHall(models.Model): def __str__(self): return self.name + class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() diff --git a/cinema/serializers.py b/cinema/serializers.py index ceebfa13d..55d5f8eb7 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -23,6 +23,7 @@ class Meta: fields = "__all__" read_only_fields = ["id"] + class CinemaHallSerializer(serializers.ModelSerializer): class Meta: model = CinemaHall From 7e6500ae4b0a9922789d58af080ae45af3b84d2d Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 13:45:37 +0200 Subject: [PATCH 5/8] fix flake8 --- cinema/serializers.py | 7 ++++++- cinema/views.py | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 55d5f8eb7..081fe2b87 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,11 @@ from rest_framework import serializers -from cinema.models import Movie, Actor, Genre, CinemaHall +from cinema.models import ( + Movie, + Actor, + Genre, + CinemaHall +) class MovieSerializer(serializers.ModelSerializer): diff --git a/cinema/views.py b/cinema/views.py index 64e9e6f95..83b673166 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -5,8 +5,18 @@ from django.shortcuts import get_object_or_404 -from cinema.models import Movie, Genre, Actor, CinemaHall -from cinema.serializers import MovieSerializer, GenreSerializer, ActorSerializer, CinemaHallSerializer +from cinema.models import ( + Movie, + Genre, + Actor, + CinemaHall +) +from cinema.serializers import ( + MovieSerializer, + GenreSerializer, + ActorSerializer, + CinemaHallSerializer +) class GenreList(APIView): From 8face341319c6237072e5071563e59a59544ebcb Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 13:59:22 +0200 Subject: [PATCH 6/8] Solution --- cinema/serializers.py | 2 +- cinema/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 081fe2b87..3ac80eff7 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -11,7 +11,7 @@ class MovieSerializer(serializers.ModelSerializer): class Meta: model = Movie - fields = "__all__" + fields = ['id', 'title', 'description', 'duration'] read_only_fields = ["id"] diff --git a/cinema/urls.py b/cinema/urls.py index d01b7fcff..a18a6c335 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -12,7 +12,7 @@ router = routers.DefaultRouter() router.register("movies", MovieViewSet) -router.register("cinema-halls", CinemaHallViewSet) +router.register("cinema_halls", CinemaHallViewSet) urlpatterns = [ path("genres/", GenreList.as_view(), name="genre-list"), From b002bae8f303ece57a986d3ddc9ffe706c8a44df Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 14:00:29 +0200 Subject: [PATCH 7/8] fix flake8 --- cinema/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 3ac80eff7..91bf3142e 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -11,7 +11,7 @@ class MovieSerializer(serializers.ModelSerializer): class Meta: model = Movie - fields = ['id', 'title', 'description', 'duration'] + fields = ["id", "title", "description", "duration"] read_only_fields = ["id"] From a2d207f1b57c1aa9c67dd5d37361e8fc2fe2a476 Mon Sep 17 00:00:00 2001 From: Vladyslav Kucherenko Date: Sat, 7 Dec 2024 18:53:32 +0200 Subject: [PATCH 8/8] fix --- cinema/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index a18a6c335..49f823ae3 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -10,6 +10,8 @@ MovieViewSet ) +app_name = "cinema" + router = routers.DefaultRouter() router.register("movies", MovieViewSet) router.register("cinema_halls", CinemaHallViewSet) @@ -22,5 +24,3 @@ path("", include(router.urls)), ] - -app_name = "cinema"