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..c1a151640 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2023-11-28 19:14 + +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')), + ('firs_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(to='cinema.actor'), + ), + migrations.AddField( + model_name='movie', + name='genres', + field=models.ManyToManyField(to='cinema.genre'), + ), + ] diff --git a/cinema/migrations/0003_rename_firs_name_actor_first_name.py b/cinema/migrations/0003_rename_firs_name_actor_first_name.py new file mode 100644 index 000000000..5eae70f41 --- /dev/null +++ b/cinema/migrations/0003_rename_firs_name_actor_first_name.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1 on 2023-11-28 19:15 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cinema', '0002_actor_cinemahall_genre_movie_actors_movie_genres'), + ] + + operations = [ + migrations.RenameField( + model_name='actor', + old_name='firs_name', + new_name='first_name', + ), + ] diff --git a/cinema/migrations/0004_alter_movie_actors_alter_movie_genres.py b/cinema/migrations/0004_alter_movie_actors_alter_movie_genres.py new file mode 100644 index 000000000..696d33019 --- /dev/null +++ b/cinema/migrations/0004_alter_movie_actors_alter_movie_genres.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1 on 2023-11-30 19:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cinema', '0003_rename_firs_name_actor_first_name'), + ] + + operations = [ + migrations.AlterField( + model_name='movie', + name='actors', + field=models.ManyToManyField(related_name='movies', to='cinema.actor'), + ), + migrations.AlterField( + 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..aa650d528 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -5,6 +5,23 @@ 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 + + +class Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + +class Actor(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + rows = models.IntegerField() + seats_in_row = models.IntegerField() diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..e06798dbb 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,29 @@ from rest_framework import serializers +from cinema.models import Movie, Genre, Actor, CinemaHall -from cinema.models import Movie +class GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = "__all__" -class MovieSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - title = serializers.CharField(max_length=255) - description = serializers.CharField() - duration = serializers.IntegerField() - def create(self, validated_data): - return Movie.objects.create(**validated_data) +class ActorSerializer(serializers.ModelSerializer): + class Meta: + model = Actor + fields = "__all__" - 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) - instance.save() +class CinemaHallSerializer(serializers.ModelSerializer): + class Meta: + model = CinemaHall + fields = "__all__" - return instance + +class MovieSerializer(serializers.ModelSerializer): + actors = ActorSerializer(many=True, read_only=True) + genres = GenreSerializer(many=True, read_only=True) + + class Meta: + model = Movie + fields = ["id", "title", "description", "duration", "actors", "genres"] diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..1f11f04e9 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,46 @@ -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 (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", + "patch": "partial_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-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..6654e0ef2 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,22 +1,25 @@ -from rest_framework.decorators import api_view +from django.http import Http404 from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, mixins, generics, 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) +class GenreList(APIView): + def get(self, request): + genre = Genre.objects.all() + serializer = GenreSerializer(genre, many=True) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "POST": - serializer = MovieSerializer(data=request.data) + def post(self, request): + serializer = GenreSerializer(data=request.data) + if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) @@ -24,22 +27,87 @@ def movie_list(request): 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): + try: + return Genre.objects.get(pk=pk) + except Genre.DoesNotExist: + raise Http404 - 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) + def patch(self, request, pk): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, 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": - movie.delete() + def put(self, request, pk): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) + + if serializer.is_valid(): + serializer.save() + return Response(serializer.data) + + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + + 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, + generics.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, + generics.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 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(viewsets.GenericViewSet, + mixins.UpdateModelMixin, + mixins.RetrieveModelMixin, + mixins.DestroyModelMixin, + mixins.ListModelMixin, + mixins.CreateModelMixin): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/requirements.txt b/requirements.txt index 99938e15f..6715d8169 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,13 @@ -django==4.1 +asgiref==3.7.2 +Django==4.1 +django-debug-toolbar==3.2.4 +djangorestframework==3.13.1 flake8==5.0.4 flake8-quotes==3.3.1 flake8-variables-names==0.0.5 +mccabe==0.7.0 pep8-naming==0.13.2 -django-debug-toolbar==3.2.4 -djangorestframework==3.13.1 +pycodestyle==2.9.1 +pyflakes==2.5.0 +pytz==2023.3.post1 +sqlparse==0.4.4