diff --git a/cinema/admin.py b/cinema/admin.py index 06a2c4616..92067c23c 100644 --- a/cinema/admin.py +++ b/cinema/admin.py @@ -1,8 +1,9 @@ from django.contrib import admin -from cinema.models import Movie +from cinema.models import Movie, Genre, Actor, CinemaHall -@admin.register(Movie) -class MovieAdmin(admin.ModelAdmin): - pass +admin.site.register(Movie) +admin.site.register(Genre) +admin.site.register(Actor) +admin.site.register(CinemaHall) 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..7f1a58f5d --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2024-09-28 08:28 + +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.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_alter_actor_first_name_alter_actor_last_name_and_more.py b/cinema/migrations/0003_alter_actor_first_name_alter_actor_last_name_and_more.py new file mode 100644 index 000000000..d55e06289 --- /dev/null +++ b/cinema/migrations/0003_alter_actor_first_name_alter_actor_last_name_and_more.py @@ -0,0 +1,43 @@ +# Generated by Django 4.1 on 2024-09-28 09:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cinema', '0002_actor_cinemahall_genre_movie_actors_movie_genres'), + ] + + operations = [ + migrations.AlterField( + model_name='actor', + name='first_name', + field=models.CharField(max_length=30), + ), + migrations.AlterField( + model_name='actor', + name='last_name', + field=models.CharField(max_length=30), + ), + migrations.AlterField( + model_name='cinemahall', + name='name', + field=models.CharField(max_length=25), + ), + migrations.AlterField( + model_name='genre', + name='name', + field=models.CharField(max_length=30, unique=True), + ), + 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..fefb70f15 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,33 @@ from django.db import models +class Genre(models.Model): + name = models.CharField(max_length=30, unique=True) + + def __str__(self): + return self.name + + +class Actor(models.Model): + first_name = models.CharField(max_length=30) + last_name = models.CharField(max_length=30) + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() duration = models.IntegerField() + genres = models.ManyToManyField(Genre, related_name="movies") + actors = models.ManyToManyField(Actor, related_name="movies") def __str__(self): return self.title + + +class CinemaHall(models.Model): + name = models.CharField(max_length=25) + rows = models.IntegerField() + seats_in_row = models.IntegerField() diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..62b4fadc4 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Movie, CinemaHall, Genre, Actor class MovieSerializer(serializers.Serializer): @@ -9,15 +9,71 @@ class MovieSerializer(serializers.Serializer): description = serializers.CharField() duration = serializers.IntegerField() - def create(self, validated_data): + def create(self, validated_data: dict) -> Movie: return Movie.objects.create(**validated_data) - def update(self, instance, validated_data): + def update(self, instance, validated_data: dict) -> Movie: 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() + + return instance + + +class CinemaHallSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=25) + rows = serializers.IntegerField() + seats_in_row = serializers.IntegerField() + + def create(self, validated_data: dict) -> CinemaHall: + return CinemaHall.objects.create(**validated_data) + + def update(self, instance: CinemaHall, validated_data: dict) -> CinemaHall: + 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 GenreSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=25) + + def create(self, validated_data: dict) -> Genre: + return Genre.objects.create(**validated_data) + + def update(self, instance: Genre, validated_data: dict) -> Genre: + instance.name = validated_data.get("name", instance.name) + + instance.save() + + return instance + + +class ActorSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=63) + last_name = serializers.CharField(max_length=63) + + def create(self, validated_data: dict) -> Actor: + return Actor.objects.create(**validated_data) + + def update(self, instance: Actor, validated_data: dict) -> Actor: + instance.first_name = validated_data.get( + "first_name", instance.first_name + ) + instance.last_name = validated_data.get( + "last_name", instance.last_name + ) instance.save() diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..28b18dd55 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,47 @@ -from django.urls import path +from django.urls import path, include -from cinema.views import movie_list, movie_detail +from rest_framework import routers + +from cinema.views import ( + MovieViewSet, + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet +) + +cinema_hall_detail = CinemaHallViewSet.as_view( + actions={ + "get": "retrieve", + "put": "update", + "patch": "partial_update", + "delete": "destroy" + } +) + +cinema_hall_list = CinemaHallViewSet.as_view( + actions={ + "get": "list", + "post": "create" + } +) + +router = routers.DefaultRouter() +router.register("movies", MovieViewSet) 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="genres-list"), + path("genres//", GenreDetail.as_view(), name="genre-detail"), + path("actors/", ActorList.as_view(), name="actors"), + 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..34327ac3e 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,110 @@ -from rest_framework.decorators import api_view -from rest_framework.response import Response -from rest_framework import status - from django.shortcuts import get_object_or_404 -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from rest_framework import mixins, generics, status, viewsets +from rest_framework.response import Response +from rest_framework.views import APIView + +from cinema.models import Actor, CinemaHall, Genre, Movie +from cinema.serializers import ( + ActorSerializer, + CinemaHallSerializer, + GenreSerializer, + MovieSerializer +) -@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) -> 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) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_201_CREATED) + def post(self, request) -> Response: + serializer = GenreSerializer(data=request.data) + 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) +class GenreDetail(APIView): + def get_object(self, pk): + return get_object_or_404(Genre, pk=pk) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) + def get(self, request, pk) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre) + return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "GET": - serializer = MovieSerializer(movie) + def put(self, request, pk) -> Response: + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() 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) + def delete(self, request, pk) -> Response: + genre = self.get_object(pk) + genre.delete() + return Response(status=status.HTTP_204_NO_CONTENT) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk) -> Response: + genre = self.get_object(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) - if request.method == "DELETE": - 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, *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( + 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