diff --git a/cinema/migrations/0001_initial.py b/cinema/migrations/0001_initial.py index 514947a64..8f0b180c1 100644 --- a/cinema/migrations/0001_initial.py +++ b/cinema/migrations/0001_initial.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [] 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..52ba35b85 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,70 @@ +# Generated by Django 4.1 on 2023-11-28 21:10 + +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=64)), + ("last_name", models.CharField(max_length=64)), + ], + ), + migrations.CreateModel( + name="CinemaHall", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=64)), + ("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=64, 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..229276393 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,9 +1,35 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=64) + last_name = models.CharField(max_length=64) + + def __str__(self) -> str: + return f"{self.first_name}, {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=64, unique=True) + + def __str__(self) -> str: + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=64) + rows = models.IntegerField() + seats_in_row = models.IntegerField() + + def __str__(self) -> str: + return f"{self.name} rows: {self.rows} seats: {self.seats_in_row}" + + 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..2bcec956f 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,104 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Movie, Actor, CinemaHall, Genre class MovieSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) title = serializers.CharField(max_length=255) description = serializers.CharField() + actors = serializers.PrimaryKeyRelatedField( + queryset=Actor.objects.all(), + many=True + ) + genres = serializers.PrimaryKeyRelatedField( + queryset=Genre.objects.all(), + many=True + ) 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) + + for actor_data in actors_data: + actor, created = Actor.objects.get_or_create(**actor_data) + movie.actors.add(actor) + + for genre_data in genres_data: + genre, created = Genre.objects.get_or_create(**genre_data) + movie.genres.add(genre) + + return movie def update(self, instance, validated_data): instance.title = validated_data.get("title", instance.title) instance.description = validated_data.get( - "description", instance.description + "description", + instance.description ) instance.duration = validated_data.get("duration", instance.duration) instance.save() + for field_name in ["actors", "genres"]: + if field_name in validated_data: + field = getattr(instance, field_name) + field.set(validated_data[field_name]) + + return instance + + +class ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=64) + last_name = serializers.CharField(max_length=64) + + 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=64) + + 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=64) + 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..5bcbe759c 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 .views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet, +) + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) + +cinema_list = CinemaHallViewSet.as_view( + actions={ + "get": "list", + "post": "create", + } +) +cinema_detail = CinemaHallViewSet.as_view( + actions={ + "get": "retrieve", + "put": "update", + "patch": "partial_update", + "delete": "destroy", + } +) -from cinema.views import movie_list, movie_detail 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_list, name="cinema-list"), + path("cinema_halls//", cinema_detail, name="cinema-detail"), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..466377da1 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,114 @@ -from rest_framework.decorators import api_view +from rest_framework.request import Request from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, mixins, generics, viewsets +from rest_framework.views import APIView 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: Request) -> Response: + 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) + def post(self, request: Request) -> Response: + serializer = GenreSerializer(data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -@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: Request, pk: int) -> Response: + movie = self.get_object(pk) + serializer = GenreSerializer(movie) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) + def put(self, request: Request, pk: int) -> Response: + movie = self.get_object(pk) + serializer = GenreSerializer(movie, data=request.data) if serializer.is_valid(): 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: Request, pk: int) -> Response: + movie = self.get_object(pk) + serializer = GenreSerializer(movie, data=request.data, partial=True) + if serializer.is_valid(): + serializer.save() + return Response(serializer.data, status=status.HTTP_200_OK) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - if request.method == "DELETE": + def delete(self, request: Request, pk: int) -> Response: + movie = self.get_object(pk) movie.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: Request, *args, **kwargs) -> Response: + return self.list(request, *args, **kwargs) + + def post(self, request: Request, *args, **kwargs) -> Response: + 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: 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) + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/cinema_service/settings.py b/cinema_service/settings.py index def98786c..d4eb01886 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -20,9 +20,8 @@ # 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 @@ -95,15 +94,15 @@ }, { "NAME": "django.contrib.auth.password_validation." - "MinimumLengthValidator", + "MinimumLengthValidator", }, { "NAME": "django.contrib.auth.password_validation." - "CommonPasswordValidator", + "CommonPasswordValidator", }, { "NAME": "django.contrib.auth.password_validation." - "NumericPasswordValidator", + "NumericPasswordValidator", }, ]