From 24005eb794e9e0691b1245002e8ab7237f3403bb Mon Sep 17 00:00:00 2001 From: Mafialate Date: Mon, 11 May 2026 15:36:19 +0200 Subject: [PATCH 1/6] Solution --- cinema/models.py | 23 +++++++ cinema/serializers.py | 55 +++++++++++++++-- cinema/urls.py | 35 +++++++++-- cinema/views.py | 121 ++++++++++++++++++++++++++++--------- cinema_service/settings.py | 13 ++-- manage.py | 1 + 6 files changed, 202 insertions(+), 46 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index cc477513f..0a0a86917 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,9 +1,32 @@ from django.db import models +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) + + 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..6f89ada78 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,10 +1,12 @@ 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) + actors = serializers.PrimaryKeyRelatedField(many=True, read_only=True) + genres = serializers.PrimaryKeyRelatedField(many=True, read_only=True) title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() @@ -14,11 +16,56 @@ def create(self, 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.description = validated_data.get("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(max_length=255) + last_name = serializers.CharField(max_length=255) + + 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=255) + + 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=255) + 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() + return instance diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..d92c92be9 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,37 @@ -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 ( + ActorList, + ActorDetail, + GenreList, + GenreDetail, + CinemaHallViewSet, + MovieViewSet, +) + +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", + } +) + +routers = routers.DefaultRouter() +routers.register("movies", MovieViewSet) urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), + path("", include(routers.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..5b264e51c 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,108 @@ -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 from django.shortcuts import get_object_or_404 +from rest_framework.views import APIView +from rest_framework.viewsets import ModelViewSet, GenericViewSet -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): + 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) - 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) + 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) + 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 ActorList( + generics.GenericAPIView, + mixins.ListModelMixin, + mixins.CreateModelMixin, +): + 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( + generics.GenericAPIView, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request, *args, **kwargs): + return self.retrieve(request, *args, **kwargs) + + def put(self, request, *argh, **kwargs): + return self.update(request, *argh, **kwargs) + + def patch(self, request, *argh, **kwargs): + return self.partial_update(request, *argh, **kwargs) + + def delete(self, request, *argh, **kwargs): + return self.destroy(request, *argh, **kwargs) + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + GenericViewSet, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/cinema_service/settings.py b/cinema_service/settings.py index def98786c..abc1c71db 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -20,9 +20,7 @@ # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = ( - "django-insecure-ru6ndfka@95_(lysua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" -) +SECRET_KEY = "django-insecure-ru6ndfka@95_(lysua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -94,16 +92,13 @@ "UserAttributeSimilarityValidator", }, { - "NAME": "django.contrib.auth.password_validation." - "MinimumLengthValidator", + "NAME": "django.contrib.auth.password_validation." "MinimumLengthValidator", }, { - "NAME": "django.contrib.auth.password_validation." - "CommonPasswordValidator", + "NAME": "django.contrib.auth.password_validation." "CommonPasswordValidator", }, { - "NAME": "django.contrib.auth.password_validation." - "NumericPasswordValidator", + "NAME": "django.contrib.auth.password_validation." "NumericPasswordValidator", }, ] diff --git a/manage.py b/manage.py index f64b24321..5045324ac 100755 --- a/manage.py +++ b/manage.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Django's command-line utility for administrative tasks.""" + import os import sys From e645ad6152558c4790221d46b9b1579279a342a8 Mon Sep 17 00:00:00 2001 From: Mafialate Date: Mon, 11 May 2026 15:36:44 +0200 Subject: [PATCH 2/6] Solution --- ...emahall_genre_movie_actors_movie_genres.py | 71 +++++++++++++++++++ 1 file 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..36d913048 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,71 @@ +# Generated by Django 4.1 on 2026-05-09 18:35 + +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"), + ), + ] From 6a367af9042259a2bebf0c74796b0ff552b87042 Mon Sep 17 00:00:00 2001 From: Mafialate Date: Mon, 11 May 2026 15:43:13 +0200 Subject: [PATCH 3/6] Fix flake8 --- .flake8 | 2 +- cinema/serializers.py | 13 ++++++++++--- cinema/urls.py | 13 +++++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.flake8 b/.flake8 index cabebb864..a95165aa4 100644 --- a/.flake8 +++ b/.flake8 @@ -6,5 +6,5 @@ max-complexity = 18 select = B,C,E,F,W,T4,B9,Q0,N8,VNE exclude = **migrations - venv + .venv1 tests \ No newline at end of file diff --git a/cinema/serializers.py b/cinema/serializers.py index 6f89ada78..bc1e6aeb8 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -16,7 +16,10 @@ def create(self, 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.description = validated_data.get( + "description", + instance.description + ) instance.duration = validated_data.get("duration", instance.duration) instance.save() @@ -33,8 +36,12 @@ 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.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 diff --git a/cinema/urls.py b/cinema/urls.py index d92c92be9..da31a9880 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -10,7 +10,12 @@ MovieViewSet, ) -cinema_hall_list = CinemaHallViewSet.as_view(actions={"get": "list", "post": "create"}) +cinema_hall_list = CinemaHallViewSet.as_view( + actions={ + "get": "list", + "post": "create" + } +) cinema_hall_detail = CinemaHallViewSet.as_view( actions={ @@ -31,7 +36,11 @@ 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"), + path( + "cinema_halls//", + cinema_hall_detail, + name="cinema-hall-detail" + ), ] app_name = "cinema" From 82092d1f6db545a4f57224d7e295021a1d1a0999 Mon Sep 17 00:00:00 2001 From: Mafialate Date: Mon, 11 May 2026 17:22:45 +0200 Subject: [PATCH 4/6] Add save to put and patch & update flake8 --- .flake8 | 3 ++- cinema/serializers.py | 6 ++++-- cinema/views.py | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.flake8 b/.flake8 index a95165aa4..8c870ece3 100644 --- a/.flake8 +++ b/.flake8 @@ -7,4 +7,5 @@ select = B,C,E,F,W,T4,B9,Q0,N8,VNE exclude = **migrations .venv1 - tests \ No newline at end of file + tests + .\cinema_service\settings.py diff --git a/cinema/serializers.py b/cinema/serializers.py index bc1e6aeb8..0440a9775 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -5,8 +5,8 @@ class MovieSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) - actors = serializers.PrimaryKeyRelatedField(many=True, read_only=True) - genres = serializers.PrimaryKeyRelatedField(many=True, read_only=True) + actors = serializers.PrimaryKeyRelatedField(many=True) + genres = serializers.PrimaryKeyRelatedField(many=True) title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() @@ -16,6 +16,8 @@ def create(self, validated_data): def update(self, instance, validated_data): instance.title = validated_data.get("title", instance.title) + instance.actors = validated_data.get("actors", instance.actors) + instance.genres = validated_data.get("genres", instance.genres) instance.description = validated_data.get( "description", instance.description diff --git a/cinema/views.py b/cinema/views.py index 5b264e51c..5ee48371d 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -40,12 +40,14 @@ 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) 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) def delete(self, request, pk): From 6e18e35bab1b77bca25769e79401a2ce7bc89c80 Mon Sep 17 00:00:00 2001 From: Mafialate Date: Mon, 11 May 2026 17:26:43 +0200 Subject: [PATCH 5/6] update settings --- cinema_service/settings.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cinema_service/settings.py b/cinema_service/settings.py index abc1c71db..fb51377ff 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -20,7 +20,9 @@ # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = "django-insecure-ru6ndfka@95_(lysua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" +SECRET_KEY = ( + "django-insecure-ru6ndfka@95_(lysua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" +) # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -92,13 +94,16 @@ "UserAttributeSimilarityValidator", }, { - "NAME": "django.contrib.auth.password_validation." "MinimumLengthValidator", + "NAME": "django.contrib.auth.password_validation." + "MinimumLengthValidator", }, { - "NAME": "django.contrib.auth.password_validation." "CommonPasswordValidator", + "NAME": "django.contrib.auth.password_validation." + "CommonPasswordValidator", }, { - "NAME": "django.contrib.auth.password_validation." "NumericPasswordValidator", + "NAME": "django.contrib.auth.password_validation." + "NumericPasswordValidator", }, ] From 884ba54b3ac7963851af5e808faf5dd9d6922e9a Mon Sep 17 00:00:00 2001 From: Mafialate Date: Mon, 11 May 2026 18:38:44 +0200 Subject: [PATCH 6/6] Update create and update methods in Movie serializer --- cinema/serializers.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 0440a9775..225821bab 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -5,19 +5,34 @@ class MovieSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) - actors = serializers.PrimaryKeyRelatedField(many=True) - genres = serializers.PrimaryKeyRelatedField(many=True) + actors = serializers.PrimaryKeyRelatedField( + many=True, + queryset=Actor.objects.all() + ) + genres = serializers.PrimaryKeyRelatedField( + many=True, + queryset=Genre.objects.all() + ) title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() 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): + actors_data = validated_data.pop("actors", None) + genres_data = validated_data.pop("genres", None) + instance.title = validated_data.get("title", instance.title) - instance.actors = validated_data.get("actors", instance.actors) - instance.genres = validated_data.get("genres", instance.genres) instance.description = validated_data.get( "description", instance.description @@ -26,6 +41,11 @@ def update(self, instance, validated_data): instance.save() + if actors_data is not None: + instance.actors.set(actors_data) + if genres_data is not None: + instance.genres.set(genres_data) + return instance