diff --git a/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_duration_and_more.py b/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_duration_and_more.py new file mode 100644 index 000000000..4b56c0571 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_duration_and_more.py @@ -0,0 +1,76 @@ +# Generated by Django 4.1 on 2024-09-28 12:57 + +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.PositiveIntegerField()), + ("seats_in_row", models.PositiveIntegerField()), + ], + ), + 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.AlterField( + model_name="movie", + name="duration", + field=models.PositiveIntegerField(), + ), + migrations.AddField( + model_name="movie", + name="actors", + field=models.ManyToManyField(to="cinema.actor"), + ), + migrations.AddField( + model_name="movie", + name="genres", + field=models.ManyToManyField(to="cinema.genre"), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..1454304c7 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,45 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + + def __str__(self): + return f"{self.first_name} {self.last_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.PositiveIntegerField() + seats_in_row = models.PositiveIntegerField() + + def __str__(self): + return self.name + + class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() - duration = models.IntegerField() + duration = models.PositiveIntegerField() + actors = models.ManyToManyField(Actor, related_name="movies") + genres = models.ManyToManyField(Genre, related_name="movies") + + def save(self, *args, **kwargs): + super().save(*args, **kwargs) + + def set_related_fields(self, actors=None, genres=None): + if actors is not None: + self.actors.set(actors) + if genres is not None: + self.genres.set(genres) def __str__(self): return self.title diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..ef0b9dc71 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,60 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Actor, Genre, CinemaHall, Movie + + +class ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=100) + last_name = serializers.CharField(max_length=100) + + 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=100) + + 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=100) + 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 class MovieSerializer(serializers.Serializer): @@ -8,17 +62,52 @@ 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) - def create(self, validated_data): - return Movie.objects.create(**validated_data) + def create(self, validated_data: dict) -> Movie: + actors_data = validated_data.pop("actors", []) + genres_data = validated_data.pop("genres", []) + movie = Movie.objects.create(**validated_data) - def update(self, instance, validated_data): - instance.title = validated_data.get("title", instance.title) + if actors_data: + for actor_data in actors_data: + actor = Actor.objects.get(id=actor_data["id"]) + movie.actors.add(actor) + + if genres_data: + for genre_data in genres_data: + genre = Genre.objects.get(id=genre_data["id"]) + movie.genres.add(genre) + + return movie + + def update(self, instance: Movie, validated_data: dict) -> Movie: + actors_data = validated_data.pop("actors", None) + genres_data = validated_data.pop("genres", None) + + instance.title = validated_data.get( + "title", instance.title + ) instance.description = validated_data.get( "description", instance.description ) - instance.duration = validated_data.get("duration", instance.duration) + instance.duration = validated_data.get( + "duration", + instance.duration + ) - instance.save() + if actors_data is not None: + instance.actors.clear() + for actor_data in actors_data: + actor = Actor.objects.get(id=actor_data["id"]) + instance.actors.add(actor) + if genres_data is not None: + instance.genres.clear() + for genre_data in genres_data: + genre = Genre.objects.get(id=genre_data["id"]) + instance.genres.add(genre) + + instance.save() return instance diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..b5155f0c7 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,27 @@ -from django.urls import path +from django.urls import path, include +from rest_framework.routers import DefaultRouter -from cinema.views import movie_list, movie_detail +from cinema.views import ( + movie_list, + movie_detail, + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet, +) -urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), -] +router = DefaultRouter() +router.register(r"cinema_halls", CinemaHallViewSet, basename="cinema_hall") +router.register(r"movies", MovieViewSet) app_name = "cinema" + +urlpatterns = [ + 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("", include(router.urls)), +] diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..3057137e2 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,15 +1,23 @@ -from rest_framework.decorators import api_view -from rest_framework.response import Response -from rest_framework import status +from typing import Any from django.shortcuts import get_object_or_404 +from rest_framework import status, generics, viewsets, mixins +from rest_framework.decorators import api_view +from rest_framework.request import Request +from rest_framework.response import Response +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): +def movie_list(request: Request) -> Response: if request.method == "GET": movies = Movie.objects.all() serializer = MovieSerializer(movies, many=True) @@ -17,29 +25,116 @@ def movie_list(request): if request.method == "POST": serializer = MovieSerializer(data=request.data) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_201_CREATED) + 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) - -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): +@api_view(["GET", "PUT", "DELETE", "PATCH"]) +def movie_detail(request: Request, pk: int) -> Response: movie = get_object_or_404(Movie, pk=pk) if request.method == "GET": serializer = MovieSerializer(movie) 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) - - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + if request.method in ["PUT", "PATCH"]: + partial = request.method == "PATCH" + serializer = MovieSerializer(movie, data=request.data, partial=partial) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data, status=status.HTTP_200_OK) if request.method == "DELETE": movie.delete() return Response(status=status.HTTP_204_NO_CONTENT) + + +class GenreList(APIView): + def get(self, request: Request) -> Response: + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) + return Response(serializer.data) + + def post(self, request: Request) -> Response: + 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(self, request: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=pk) + serializer = GenreSerializer(genre) + return Response(serializer.data) + + def put(self, request: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=pk) + serializer = GenreSerializer(genre, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) + + def patch(self, request: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=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: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=pk) + genre.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: Any, **kwargs: Any) -> Response: + return self.list(request, *args, **kwargs) + + def post(self, request: Request, *args: Any, **kwargs: Any) -> 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: Any, **kwargs: Any) -> Response: + return self.retrieve(request, *args, **kwargs) + + def put(self, request: Request, *args: Any, **kwargs: Any) -> Response: + return self.update(request, *args, **kwargs) + + def patch(self, request: Request, *args: Any, **kwargs: Any) -> Response: + return self.partial_update(request, *args, **kwargs) + + def delete(self, request: Request, *args: Any, **kwargs: Any) -> Response: + return self.destroy(request, *args, **kwargs) + + +class CinemaHallViewSet( + viewsets.GenericViewSet, + generics.ListCreateAPIView, + generics.RetrieveUpdateDestroyAPIView, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/cinema_service/urls.py b/cinema_service/urls.py index 229767ed9..e126f35c1 100644 --- a/cinema_service/urls.py +++ b/cinema_service/urls.py @@ -3,5 +3,5 @@ urlpatterns = [ path("admin/", admin.site.urls), - path("api/cinema/", include("cinema.urls", namespace="cinema")), + path("api/cinema/", include("cinema.urls", namespace="cinema")) ]