diff --git a/.gitignore b/.gitignore index 9c18d6ac5..bbae997be 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ venv/ .pytest_cache/ **__pycache__/ *.pyc -db.sqlite3 \ No newline at end of file +db.sqlite3 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..cb0de5559 --- /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-10-11 15:34 + +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.PositiveSmallIntegerField()), + ('seats_in_row', models.PositiveSmallIntegerField()), + ], + ), + 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(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..a04d635a2 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,33 @@ 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.PositiveSmallIntegerField() + seats_in_row = models.PositiveSmallIntegerField() + + 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..13cdd7e83 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from cinema.models import Movie +from .models import Movie, Genre, CinemaHall, Actor class MovieSerializer(serializers.Serializer): @@ -22,3 +22,60 @@ def update(self, instance, validated_data): instance.save() return instance + + +class GenreSerializer(serializers.Serializer): + name = serializers.CharField() + + 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 ActorSerializer(serializers.Serializer): + first_name = serializers.CharField() + last_name = serializers.CharField() + + 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 CinemaHallSerializer(serializers.Serializer): + name = serializers.CharField() + 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..6945e78b0 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 cinema.views import movie_list, movie_detail +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + MovieViewSet, + CinemaHallViewSet, +) + +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..8f8a9d953 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,82 @@ -from rest_framework.decorators import api_view from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, generics, 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 .models import Movie, Genre, Actor, CinemaHall +from .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 MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer + + +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) - if request.method == "POST": - serializer = MovieSerializer(data=request.data) - if serializer.is_valid(): + def post(self, request): + serializer = GenreSerializer(data=request.data) + if 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): - 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): + serializer = GenreSerializer(self.get_object(pk)) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) - if serializer.is_valid(): + def put(self, request, pk): + serializer = GenreSerializer(self.get_object(pk), data=request.data) + if 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): + serializer = GenreSerializer( + self.get_object(pk), + data=request.data, + partial=True, + ) + if 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): + self.get_object(pk).delete() return Response(status=status.HTTP_204_NO_CONTENT) + + +class ActorList(generics.ListCreateAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + +class ActorDetail(generics.RetrieveUpdateDestroyAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.UpdateModelMixin, + mixins.RetrieveModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer diff --git a/requirements.txt b/requirements.txt index 99938e15f..75daf803f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -django==4.1 +django==4.2.6 flake8==5.0.4 flake8-quotes==3.3.1 flake8-variables-names==0.0.5 pep8-naming==0.13.2 django-debug-toolbar==3.2.4 -djangorestframework==3.13.1 +djangorestframework==3.14.0