diff --git a/.gitignore b/.gitignore index 9c18d6ac5..530b2c278 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ venv/ .pytest_cache/ **__pycache__/ *.pyc -db.sqlite3 \ No newline at end of file +db.sqlite3 +.mypy.ini +pyrightconfig.json 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..b82b30572 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,79 @@ +# Generated by Django 4.1 on 2023-10-10 13:04 + +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=63)), + ("last_name", models.CharField(max_length=63)), + ], + options={ + "ordering": ("first_name",), + }, + ), + migrations.CreateModel( + name="CinemaHall", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=63)), + ("rows", models.PositiveIntegerField()), + ("seats_in_row", models.PositiveIntegerField()), + ], + options={ + "ordering": ("name",), + }, + ), + migrations.CreateModel( + name="Genre", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=63, unique=True)), + ], + options={ + "ordering": ("name",), + }, + ), + 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..3be6420ee 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=63) + last_name = models.CharField(max_length=63) + + class Meta: + ordering = ("first_name",) + + def __str__(self) -> str: + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=63, unique=True) + + class Meta: + ordering = ("name",) + + def __str__(self) -> str: + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=63) + rows = models.PositiveIntegerField() + seats_in_row = models.PositiveIntegerField() + + class Meta: + ordering = ("name",) + + def __str__(self) -> str: + return self.name + + 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): + def __str__(self) -> str: return self.title diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..2f9fd4138 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,27 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Actor, CinemaHall, Genre, Movie -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 = ("id", "title", "description", "duration") - 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 = ("id", "first_name", "last_name") - instance.save() - return instance +class GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = ("id", "name") + + +class CinemaHallSerializer(serializers.ModelSerializer): + class Meta: + model = CinemaHall + fields = ("id", "name", "rows", "seats_in_row") diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..321b71715 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,41 @@ -from django.urls import path +from rest_framework.routers import SimpleRouter -from cinema.views import movie_list, movie_detail +from django.urls import include, path + +from cinema.views import ( + CinemaHallViewSet, + GenreDetail, + GenreList, + ActorList, + ActorDetail, + 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", + } +) + +router = SimpleRouter() +router.register("movies", MovieViewSet) 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="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("", include(router.urls)), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..9597ab528 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,122 @@ -from rest_framework.decorators import api_view +from rest_framework.views import APIView +from rest_framework.mixins import ( + ListModelMixin, + CreateModelMixin, + RetrieveModelMixin, + UpdateModelMixin, + DestroyModelMixin, +) +from rest_framework.generics import GenericAPIView from rest_framework.response import Response +from rest_framework.request import Request from rest_framework import status from django.shortcuts import get_object_or_404 +from rest_framework.viewsets import GenericViewSet, ModelViewSet -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from cinema.models import CinemaHall, Genre, Movie, Actor +from cinema.serializers import ( + CinemaHallSerializer, + GenreSerializer, + MovieSerializer, + ActorSerializer, +) -@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.validated_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: int) -> Genre: + genre = get_object_or_404(Genre, pk=pk) + return genre - if request.method == "GET": - serializer = MovieSerializer(movie) + def get(self, request: Request, pk: int) -> Response: + 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) + def put(self, request: Request, pk: int) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) if serializer.is_valid(): serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + return Response( + serializer.validated_data, status=status.HTTP_200_OK + ) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request: Request, pk: int) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data, partial=True) + if serializer.is_valid(): + serializer.save() + return Response( + serializer.validated_data, status=status.HTTP_200_OK + ) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - if request.method == "DELETE": - movie.delete() + def delete(self, request: Request, pk: int) -> Response: + genre = self.get_object(pk) + genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) + + +class ActorList(ListModelMixin, CreateModelMixin, 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( + RetrieveModelMixin, UpdateModelMixin, DestroyModelMixin, GenericAPIView +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request: Request, *args, **kwargs) -> Response: + return self.retrieve(request, *args, **kwargs) + + def put(self, request: Request, *args, **kwargs) -> Response: + return self.update(request, *args, **kwargs) + + def patch(self, request: Request, *args, **kwargs) -> Response: + return self.partial_update(request, *args, **kwargs) + + def delete(self, request: Request, *args, **kwargs) -> Response: + return self.destroy(request, *args, **kwargs) + + +class CinemaHallViewSet( + ListModelMixin, + RetrieveModelMixin, + CreateModelMixin, + UpdateModelMixin, + DestroyModelMixin, + GenericViewSet, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer