From 3b0c5704561692796a6b16dc802a2bb8ff035772 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:13:02 +0200 Subject: [PATCH 01/12] Finished --- cinema/models.py | 26 ++++++++++++ cinema/serializers.py | 51 +++++++++++++++++++++- cinema/urls.py | 31 ++++++++++++-- cinema/views.py | 98 +++++++++++++++++++++++++++++++++---------- 4 files changed, 179 insertions(+), 27 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index cc477513f..ec3e41e48 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,36 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=100) + last_name = models.CharField(max_length=100) + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=100, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=100) + rows = models.IntegerField() + seats_in_row = models.IntegerField() + + def __str__(self): + 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): return self.title diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..3b86d60e2 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, Actor class MovieSerializer(serializers.Serializer): @@ -22,3 +22,52 @@ def update(self, instance, validated_data): instance.save() return instance + + +class GenreSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + + def create(self, validated_data): + return Actor.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 CinemaSerializer(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 Movie.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..a616be5b2 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,33 @@ -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.models import CinemaHall +from cinema.views import CinemaHallViewSet, MovieViewSet, GenreList, GenreDetail, ActorList, ActorDetail + +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("", 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..ec6f10bb5 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,22 +1,22 @@ -from rest_framework.decorators import api_view 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, Actor, CinemaHall, Genre +from cinema.serializers import MovieSerializer, 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): + genres = Genre.objects.all() + serializer = MovieSerializer(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): + serializer = GenreSerializer(data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) @@ -24,22 +24,76 @@ 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): + return get_object_or_404(Movie, pk=pk) - if request.method == "GET": - serializer = MovieSerializer(movie) + def get(self, request, pk): + genre = self.get_object(pk) + serializer = MovieSerializer(genre) return Response(serializer.data, status=status.HTTP_200_OK) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) + 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, status=status.HTTP_200_OK) - + return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - 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( + 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 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 = CinemaHall.objects.all() + + +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer \ No newline at end of file From 1f00dd22df29e0a3b8d91d24020d608f8f7ce8c8 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:15:24 +0200 Subject: [PATCH 02/12] Finished --- cinema/serializers.py | 1 - cinema/urls.py | 3 ++- cinema/views.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 3b86d60e2..d6a497b6f 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -70,4 +70,3 @@ def update(self, instance, validated_data): instance.seats_in_row) instance.save() return instance - diff --git a/cinema/urls.py b/cinema/urls.py index a616be5b2..9b7ea6a90 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -2,7 +2,8 @@ from rest_framework import routers from cinema.models import CinemaHall -from cinema.views import CinemaHallViewSet, MovieViewSet, GenreList, GenreDetail, ActorList, ActorDetail +from cinema.views import (CinemaHallViewSet, MovieViewSet, GenreList, + GenreDetail, ActorList, ActorDetail) cinema_hall_list = CinemaHallViewSet.as_view( actions={"get": "list", "post": "create"} diff --git a/cinema/views.py b/cinema/views.py index ec6f10bb5..aaced2925 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -5,7 +5,8 @@ from rest_framework.views import APIView from cinema.models import Movie, Actor, CinemaHall, Genre -from cinema.serializers import MovieSerializer, ActorSerializer, GenreSerializer +from cinema.serializers import (MovieSerializer, ActorSerializer, + GenreSerializer) class GenreList(APIView): @@ -96,4 +97,4 @@ class CinemaHallViewSet( class MovieViewSet(viewsets.ModelViewSet): queryset = Movie.objects.all() - serializer_class = MovieSerializer \ No newline at end of file + serializer_class = MovieSerializer From fdfa55026f8d996f4d3cc66e268a9fa245371a10 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:36:36 +0200 Subject: [PATCH 03/12] Finished --- cinema/serializers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cinema/serializers.py b/cinema/serializers.py index d6a497b6f..48afcec60 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -17,6 +17,9 @@ def update(self, instance, validated_data): instance.description = validated_data.get( "description", instance.description ) + 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() From c15d93b9a22fa33f5be42c26fd54c9dc337aacc8 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:39:18 +0200 Subject: [PATCH 04/12] Finished --- cinema/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 48afcec60..b4b86df7a 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -57,7 +57,7 @@ def update(self, instance, validated_data): return instance -class CinemaSerializer(serializers.Serializer): +class CinemaHallSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) name = serializers.CharField(max_length=255) rows = serializers.IntegerField() From 57de0efec711399c728d9017ca5be01acbc2c906 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:42:33 +0200 Subject: [PATCH 05/12] Finished --- ...emahall_genre_movie_actors_movie_genres.py | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) 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..02b347be6 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2025-01-05 03:41 + +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=100)), + ('last_name', models.CharField(max_length=100)), + ], + ), + migrations.CreateModel( + name='CinemaHall', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100)), + ('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=100, 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'), + ), + ] From 6918e414e9088abf68a5b46b0ac9b984debe6cc4 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:45:22 +0200 Subject: [PATCH 06/12] Finished --- cinema/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinema/views.py b/cinema/views.py index aaced2925..658c9a8cd 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -6,7 +6,7 @@ from cinema.models import Movie, Actor, CinemaHall, Genre from cinema.serializers import (MovieSerializer, ActorSerializer, - GenreSerializer) + GenreSerializer, CinemaHallSerializer) class GenreList(APIView): @@ -92,7 +92,7 @@ class CinemaHallViewSet( viewsets.GenericViewSet ): queryset = CinemaHall.objects.all() - serializer_class = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer class MovieViewSet(viewsets.ModelViewSet): From 2459d2da7826e0ffc4d4f631a4f9d6d0928e8cae Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:47:23 +0200 Subject: [PATCH 07/12] Finished --- cinema/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinema/views.py b/cinema/views.py index 658c9a8cd..fc09b3edb 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -13,7 +13,7 @@ class GenreList(APIView): def get(self, request): genres = Genre.objects.all() - serializer = MovieSerializer(genres, many=True) + serializer = GenreSerializer(genres, many=True) return Response(serializer.data, status=status.HTTP_200_OK) def post(self, request): From 035260acde0a244da3880a2f84b23d428b5971ef Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:51:38 +0200 Subject: [PATCH 08/12] Finished --- cinema/serializers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index b4b86df7a..1390005fc 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from cinema.models import Movie, Actor +from cinema.models import Movie, Actor, Genre, CinemaHall class MovieSerializer(serializers.Serializer): @@ -32,7 +32,7 @@ class GenreSerializer(serializers.Serializer): name = serializers.CharField(max_length=255) def create(self, validated_data): - return Actor.objects.create(**validated_data) + return Genre.objects.create(**validated_data) def update(self, instance, validated_data): instance.name = validated_data.get("name", instance.name) @@ -64,7 +64,7 @@ class CinemaHallSerializer(serializers.Serializer): seats_in_row = serializers.IntegerField() def create(self, validated_data): - return Movie.objects.create(**validated_data) + return CinemaHall.objects.create(**validated_data) def update(self, instance, validated_data): instance.name = validated_data.get("name", instance.name) From bd4bf2ac644cd0f8e50db59f1501a9ff87f4a954 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 05:55:47 +0200 Subject: [PATCH 09/12] Finished --- cinema/urls.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index 9b7ea6a90..a913f9c9b 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -10,10 +10,12 @@ ) cinema_hall_detail = CinemaHallViewSet.as_view( - actions={"get": "retrieve", - "put": "update", - "patch": "partial_update", - "delete": "destroy"} + actions={ + "get": "retrieve", + "put": "update", + "patch": "partial_update", + "delete": "destroy" + } ) router = routers.DefaultRouter() @@ -22,11 +24,11 @@ urlpatterns = [ path("", include(router.urls)), path("genres/", GenreList.as_view(), name="genre-list"), - path("genres/", GenreDetail.as_view(), name="genre-detail"), + 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("actors//", ActorDetail.as_view(), name="actor-detail"), path("cinema_halls/", cinema_hall_list, name="cinema-hall-list"), - path("cinema_halls/", + path("cinema_halls//", cinema_hall_detail, name="cinema-hall-detail"), ] From 75e4d14ac8b2e3b54b9d36a3714e104d678ac1a8 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 06:02:54 +0200 Subject: [PATCH 10/12] Finished --- cinema/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinema/views.py b/cinema/views.py index fc09b3edb..e9af43ed3 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -28,11 +28,11 @@ def post(self, request): class GenreDetail(APIView): def get_object(self, pk): - return get_object_or_404(Movie, pk=pk) + return get_object_or_404(Genre, pk=pk) def get(self, request, pk): genre = self.get_object(pk) - serializer = MovieSerializer(genre) + serializer = GenreSerializer(genre) return Response(serializer.data, status=status.HTTP_200_OK) def put(self, request, pk): From 574032d749e68bcc476e0179984bd0faac0c1c87 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 06:06:51 +0200 Subject: [PATCH 11/12] Finished --- cinema/views.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cinema/views.py b/cinema/views.py index e9af43ed3..e647a921e 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -43,6 +43,15 @@ def put(self, request, pk): 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) + 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) + def delete(self, request, pk): genre = self.get_object(pk) genre.delete() @@ -79,6 +88,9 @@ def get(self, 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) From 02da98453aee5cc94700c09034008c9e4cab6064 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jan 2025 06:08:28 +0200 Subject: [PATCH 12/12] Finished --- cinema/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cinema/views.py b/cinema/views.py index e647a921e..9485b9269 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -43,7 +43,6 @@ def put(self, request, pk): 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)