From fbff533d1f5df8c5cde34def0b07dffce8708e1a Mon Sep 17 00:00:00 2001 From: Danylo Minkov Date: Mon, 4 Nov 2024 14:38:47 +0200 Subject: [PATCH 1/3] 'Solution' --- cinema/models.py | 27 ++++++++++ cinema/serializers.py | 55 ++++++++++++++++++- cinema/urls.py | 38 +++++++++++-- cinema/views.py | 123 +++++++++++++++++++++++++++++++----------- 4 files changed, 207 insertions(+), 36 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index cc477513f..9e8376385 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,37 @@ from django.db import models +class Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return self.name + + +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 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 + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + rows = models.IntegerField(default=None) + seats_in_row = models.IntegerField(default=None) + + def __str__(self): + return self.name diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..8305b72c7 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,39 @@ from rest_framework import serializers +from cinema.models import Movie, Genre, Actor, CinemaHall -from cinema.models import Movie + +class GenreSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + + 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): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=255) + last_name = serializers.CharField(max_length=255) + + 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 MovieSerializer(serializers.Serializer): @@ -22,3 +55,23 @@ def update(self, instance, validated_data): instance.save() return instance + + +class CinemaHallSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + 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..97a7adb85 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,40 @@ -from django.urls import path +from django.urls import path, include +from rest_framework import routers +from cinema.views import (MovieViewSet, + CinemaHallViewSet, + ActorList, + ActorDetail, + GenreList, + GenreDetail) -from cinema.views import movie_list, movie_detail + +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 = routers.DefaultRouter() +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..b03343f06 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,106 @@ -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 generics, mixins, viewsets, status +from rest_framework.response import Response +from rest_framework.views import APIView +from cinema.models import Movie, CinemaHall, Actor, Genre +from cinema.serializers import (MovieSerializer, + CinemaHallSerializer, + ActorSerializer, + GenreSerializer) -@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: + 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) - 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) -@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) -> 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) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + def put(self, request, pk): + genre = self.get_object(pk) + serializer = GenreSerializer(genre, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk): + 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) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk): + genre = self.get_object(pk) + genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) + +class ActorList( + generics.GenericAPIView, + mixins.ListModelMixin, + mixins.CreateModelMixin +): + 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.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer From 20bfa186a11432de02c9393126740ca35a9eb913 Mon Sep 17 00:00:00 2001 From: Danylo Minkov Date: Mon, 4 Nov 2024 14:50:26 +0200 Subject: [PATCH 2/3] 'Solution' --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++++++++++++++ cinema/models.py | 1 - cinema/views.py | 6 +-- 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py 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..3acbacf3e --- /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-11-04 12:31 + +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(default=None)), + ('seats_in_row', models.IntegerField(default=None)), + ], + ), + 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 9e8376385..d3e5ed691 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -16,7 +16,6 @@ def __str__(self): return f"{self.first_name} {self.last_name}" - class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() diff --git a/cinema/views.py b/cinema/views.py index b03343f06..5a04b0c3a 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -15,15 +15,13 @@ def get(self, request) -> Response: serializer = GenreSerializer(genre, many=True) return Response(serializer.data, status=status.HTTP_200_OK) - def post(self, request)-> Response: + 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) - - class GenreDetail(APIView): def get_object(self, pk): return get_object_or_404(Genre, pk=pk) @@ -52,11 +50,13 @@ def delete(self, request, pk): genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) + class ActorList( generics.GenericAPIView, mixins.ListModelMixin, mixins.CreateModelMixin ): + queryset = Actor.objects.all() serializer_class = ActorSerializer From 4e1e23cbae5d1c9c1ba3e56cab5d8e9d70b3c636 Mon Sep 17 00:00:00 2001 From: Danylo Minkov Date: Mon, 4 Nov 2024 15:01:47 +0200 Subject: [PATCH 3/3] 'Solution' --- ...hall_rows_alter_cinemahall_seats_in_row.py | 23 +++++++++++++++++++ cinema/models.py | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 cinema/migrations/0003_alter_cinemahall_rows_alter_cinemahall_seats_in_row.py diff --git a/cinema/migrations/0003_alter_cinemahall_rows_alter_cinemahall_seats_in_row.py b/cinema/migrations/0003_alter_cinemahall_rows_alter_cinemahall_seats_in_row.py new file mode 100644 index 000000000..a18ad6e08 --- /dev/null +++ b/cinema/migrations/0003_alter_cinemahall_rows_alter_cinemahall_seats_in_row.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1 on 2024-11-04 13:00 + +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='cinemahall', + name='rows', + field=models.IntegerField(default=None, null=True), + ), + migrations.AlterField( + model_name='cinemahall', + name='seats_in_row', + field=models.IntegerField(default=None, null=True), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index d3e5ed691..1fc9f8353 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -29,8 +29,8 @@ def __str__(self): class CinemaHall(models.Model): name = models.CharField(max_length=255) - rows = models.IntegerField(default=None) - seats_in_row = models.IntegerField(default=None) + rows = models.IntegerField(default=None, null=True) + seats_in_row = models.IntegerField(default=None, null=True) def __str__(self): return self.name