From b5d348cf32b37e1638ee1000d6deacf42d2fd440 Mon Sep 17 00:00:00 2001 From: mregorlite Date: Tue, 10 Dec 2024 13:03:39 +0200 Subject: [PATCH 1/3] Solution --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++ cinema/models.py | 20 +++ cinema/serializers.py | 62 +++++++++ cinema/urls.py | 44 ++++++- cinema/views.py | 119 +++++++++++++----- 5 files changed, 260 insertions(+), 32 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..38a14c831 --- /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-10 10:29 + +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=50)), + ('last_name', models.CharField(max_length=50)), + ], + ), + migrations.CreateModel( + name='CinemaHall', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50)), + ('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=50)), + ], + ), + 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..7014a1b0a 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,30 @@ from django.db import models +class Genre(models.Model): + name = models.CharField(max_length=50) + + def __str__(self): + return self.name + + +class Actor(models.Model): + first_name = models.CharField(max_length=50) + last_name = models.CharField(max_length=50) + + +class CinemaHall(models.Model): + name = models.CharField(max_length=50) + rows = models.IntegerField() + seats_in_row = models.IntegerField() + + 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 diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..d158ab08a 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -3,11 +3,51 @@ from cinema.models import Movie +class ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=50) + last_name = serializers.CharField(max_length=50) + + def create(self, validated_data): + return Movie.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=50) + + def create(self, validated_data): + return Movie.objects.create(**validated_data) + + def update(self, instance, validated_data): + instance.name = validated_data.get("name", instance.name) + + instance.save() + + return instance + + class MovieSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() + actors = ActorSerializer(many=True) + genres = GenreSerializer(many=True) def create(self, validated_data): return Movie.objects.create(**validated_data) @@ -22,3 +62,25 @@ def update(self, instance, validated_data): instance.save() return instance + + +class CinemaHallSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=50) + rows = serializers.IntegerField() + seats_in_row = serializers.IntegerField() + + def create(self, validated_data): + return Movie.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..855207a0c 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,46 @@ -from django.urls import path -from cinema.views import movie_list, movie_detail +from django.urls import path, include +from rest_framework import routers + +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet, +) + + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) + +cinema_hall_list = CinemaHallViewSet.as_view( + actions={ + "get": "list", + "post": "create" + } +) +cinema_hall_detail = CinemaHallViewSet.as_view( + actions={ + "get": "retrieve", + "put": "update", + "delete": "destroy" + } +) 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-halls"), + 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..61f5b3f72 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,108 @@ from rest_framework.decorators import api_view +from rest_framework.generics import GenericAPIView from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, mixins, viewsets from django.shortcuts import get_object_or_404 +from rest_framework.views import APIView -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) - return Response(serializer.data, status=status.HTTP_200_OK) +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer + - 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, status=status.HTTP_200_OK) - 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, 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 ActorList( + mixins.ListModelMixin, + mixins.CreateModelMixin, + 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, + 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 delete(self, request, *args, **kwargs): + return self.destroy(request, *args, **kwargs) + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer From 0de0bf170a408201042b1d424f8259b9250e4251 Mon Sep 17 00:00:00 2001 From: mregorlite Date: Tue, 10 Dec 2024 13:35:49 +0200 Subject: [PATCH 2/3] Fix errors --- cinema/models.py | 3 +++ cinema/serializers.py | 12 ++++++------ cinema/urls.py | 7 ++++--- cinema/views.py | 5 ++++- cinema_service/settings.py | 11 +++++++---- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index 7014a1b0a..51632eb96 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -18,6 +18,9 @@ class CinemaHall(models.Model): rows = models.IntegerField() seats_in_row = models.IntegerField() + def __str__(self): + return self.name + class Movie(models.Model): title = models.CharField(max_length=255) diff --git a/cinema/serializers.py b/cinema/serializers.py index d158ab08a..f3e0d1424 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, CinemaHall, Genre class ActorSerializer(serializers.Serializer): @@ -9,7 +9,7 @@ class ActorSerializer(serializers.Serializer): last_name = serializers.CharField(max_length=50) def create(self, validated_data): - return Movie.objects.create(**validated_data) + return Actor.objects.create(**validated_data) def update(self, instance, validated_data): instance.first_name = validated_data.get( @@ -31,7 +31,7 @@ class GenreSerializer(serializers.Serializer): name = serializers.CharField(max_length=50) def create(self, validated_data): - return Movie.objects.create(**validated_data) + return Genre.objects.create(**validated_data) def update(self, instance, validated_data): instance.name = validated_data.get("name", instance.name) @@ -46,8 +46,8 @@ class MovieSerializer(serializers.Serializer): title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() - actors = ActorSerializer(many=True) - genres = GenreSerializer(many=True) + actors = ActorSerializer(many=True, required=False) + genres = GenreSerializer(many=True, required=False) def create(self, validated_data): return Movie.objects.create(**validated_data) @@ -71,7 +71,7 @@ class CinemaHallSerializer(serializers.Serializer): seats_in_row = serializers.IntegerField() def create(self, validated_data): - return Movie.objects.create(**validated_data) + return CinemaHall.objects.create(**validated_data) def update(self, instance, validated_data): instance.name = validated_data.get("name", instance.name) diff --git a/cinema/urls.py b/cinema/urls.py index 855207a0c..3ba0302c0 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -18,14 +18,15 @@ cinema_hall_list = CinemaHallViewSet.as_view( actions={ "get": "list", - "post": "create" + "post": "create", } ) cinema_hall_detail = CinemaHallViewSet.as_view( actions={ "get": "retrieve", "put": "update", - "delete": "destroy" + "patch": "partial_update", + "delete": "destroy", } ) @@ -37,7 +38,7 @@ path("actors//", ActorDetail.as_view(), name="actor-detail"), path("cinema_halls/", cinema_hall_list, name="cinema-halls"), path( - "cinema_halls/", + "cinema_halls//", cinema_hall_detail, name="cinema-hall-detail" ), diff --git a/cinema/views.py b/cinema/views.py index 61f5b3f72..885954fa2 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -92,6 +92,9 @@ def get(self, 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) @@ -102,7 +105,7 @@ class CinemaHallViewSet( mixins.RetrieveModelMixin, mixins.UpdateModelMixin, mixins.DestroyModelMixin, - viewsets.GenericViewSet, + viewsets.GenericViewSet ): queryset = CinemaHall.objects.all() serializer_class = CinemaHallSerializer diff --git a/cinema_service/settings.py b/cinema_service/settings.py index def98786c..a25e5cdfa 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -9,7 +9,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/4.0/ref/settings/ """ - +import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -20,14 +20,17 @@ # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = ( +SECRET_KEY = os.environ.get( + "SECRET_KEY", "django-insecure-ru6ndfka@95_(lysua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" ) # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = [ + "localhost", +] # Application definition From e91f9b53cfbf9ff901fcbe68001f921f8378400c Mon Sep 17 00:00:00 2001 From: mregorlite Date: Tue, 10 Dec 2024 14:22:30 +0200 Subject: [PATCH 3/3] make genres unique, rewrite MovieSerializer --- cinema/migrations/0003_alter_genre_name.py | 18 ++++++++++++++++++ cinema/models.py | 2 +- cinema/serializers.py | 12 ++++++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 cinema/migrations/0003_alter_genre_name.py diff --git a/cinema/migrations/0003_alter_genre_name.py b/cinema/migrations/0003_alter_genre_name.py new file mode 100644 index 000000000..770259af1 --- /dev/null +++ b/cinema/migrations/0003_alter_genre_name.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1 on 2024-12-10 12:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cinema', '0002_actor_cinemahall_genre_movie_actors_movie_genres'), + ] + + operations = [ + migrations.AlterField( + model_name='genre', + name='name', + field=models.CharField(max_length=50, unique=True), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index 51632eb96..cf56e6235 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -2,7 +2,7 @@ class Genre(models.Model): - name = models.CharField(max_length=50) + name = models.CharField(max_length=50, unique=True) def __str__(self): return self.name diff --git a/cinema/serializers.py b/cinema/serializers.py index f3e0d1424..9644f09b2 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -46,8 +46,16 @@ class MovieSerializer(serializers.Serializer): title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() - actors = ActorSerializer(many=True, required=False) - genres = GenreSerializer(many=True, required=False) + actors = serializers.SlugRelatedField( + many=True, + read_only=True, + slug_field="id" + ) + genres = serializers.SlugRelatedField( + many=True, + read_only=True, + slug_field="id" + ) def create(self, validated_data): return Movie.objects.create(**validated_data)