From 4e299ce5a20bd9248d270a74531ff61e44f26920 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 20 Sep 2024 15:41:30 +0300 Subject: [PATCH 1/5] Solution --- cinema/models.py | 34 ++++++++++++ cinema/serializers.py | 58 +++++++++++++++++++-- cinema/urls.py | 42 +++++++++++++-- cinema/views.py | 118 +++++++++++++++++++++++++++++++----------- 4 files changed, 216 insertions(+), 36 deletions(-) diff --git a/cinema/models.py b/cinema/models.py index cc477513f..ca6fe5865 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -4,7 +4,41 @@ class Movie(models.Model): title = models.CharField(max_length=255) description = models.TextField() + actors = models.ManyToManyField( + "Actor", + related_name="movies", + blank=True + ) + genres = models.ManyToManyField( + "Genre", + related_name="movies", + blank=True + ) duration = models.IntegerField() def __str__(self): return self.title + + +class Actor(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + + def __str__(self): + return f"Actor: {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.IntegerField() + seats_in_row = models.IntegerField() + + def __str__(self): + return self.name diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..e926f0985 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,60 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Movie, Genre, Actor, CinemaHall + + +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 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 class MovieSerializer(serializers.Serializer): @@ -18,7 +72,5 @@ def update(self, instance, validated_data): "description", instance.description ) instance.duration = validated_data.get("duration", instance.duration) - instance.save() - return instance diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..8ba00cb96 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,44 @@ -from django.urls import path +from django.urls import path, include + +from rest_framework import routers + +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" +}) -from cinema.views import movie_list, movie_detail 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..c6576b9e6 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,105 @@ -from rest_framework.decorators import api_view +from rest_framework.generics import GenericAPIView from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, viewsets, mixins, views from django.shortcuts import get_object_or_404 -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from cinema.models import Movie, Actor, CinemaHall, Genre +from cinema.serializers import ( + MovieSerializer, + CinemaHallSerializer, + GenreSerializer, + ActorSerializer, +) -@api_view(["GET", "POST"]) -def movie_list(request): - if request.method == "GET": - movies = Movie.objects.all() - serializer = MovieSerializer(movies, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer + + +class ActorList( + mixins.ListModelMixin, + mixins.CreateModelMixin, + 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, + GenericAPIView +): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + def get(self, request, *args, **kwargs): + return self.retrieve(request, *args, **kwargs) - 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 put(self, request, *args, **kwargs): + return self.update(request, *args, **kwargs) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + 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) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) - if request.method == "GET": - serializer = MovieSerializer(movie) +class CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + viewsets.GenericViewSet +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class GenreList(views.APIView): + def get(self, request): + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) + return Response(serializer.data, status=status.HTTP_200_OK) + + def post(self, request): + serializer = GenreSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data, status=status.HTTP_201_CREATED) + + +class GenreDetail(views.APIView): + def get_object(self, pk): + return get_object_or_404(Genre, pk=pk) + + 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) - 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, status=status.HTTP_200_OK) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk): + return self.put(request, pk) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk): + genre = self.get_object(pk=pk) + genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) From 5ffb145bd40437489d66774035d08273a400b795 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 20 Sep 2024 15:42:22 +0300 Subject: [PATCH 2/5] Solution --- cinema/migrations/0001_initial.py | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 cinema/migrations/0001_initial.py diff --git a/cinema/migrations/0001_initial.py b/cinema/migrations/0001_initial.py deleted file mode 100644 index 514947a64..000000000 --- a/cinema/migrations/0001_initial.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 4.0.2 on 2022-05-03 13:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [] - - operations = [ - migrations.CreateModel( - name="Movie", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255)), - ("description", models.TextField()), - ("duration", models.IntegerField()), - ], - ), - ] From 5fee727002320c44914b4d65d9a17bda84e2700c Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 20 Sep 2024 15:46:41 +0300 Subject: [PATCH 3/5] Solution --- cinema/migrations/0001_initial.py | 49 +++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 cinema/migrations/0001_initial.py diff --git a/cinema/migrations/0001_initial.py b/cinema/migrations/0001_initial.py new file mode 100644 index 000000000..ec2cc5279 --- /dev/null +++ b/cinema/migrations/0001_initial.py @@ -0,0 +1,49 @@ +# Generated by Django 4.1 on 2024-09-20 12:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + 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.CreateModel( + name='Movie', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('description', models.TextField()), + ('duration', models.IntegerField()), + ('actors', models.ManyToManyField(blank=True, related_name='movies', to='cinema.actor')), + ('genres', models.ManyToManyField(blank=True, related_name='movies', to='cinema.genre')), + ], + ), + ] From b88d3f74cdb0c538e0e630da82736fe6bfefedda Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 20 Sep 2024 16:32:24 +0300 Subject: [PATCH 4/5] Solution --- cinema/migrations/0001_initial.py | 49 ++++++++++--------------------- cinema/serializers.py | 8 +++++ cinema/urls.py | 3 -- 3 files changed, 23 insertions(+), 37 deletions(-) diff --git a/cinema/migrations/0001_initial.py b/cinema/migrations/0001_initial.py index ec2cc5279..514947a64 100644 --- a/cinema/migrations/0001_initial.py +++ b/cinema/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1 on 2024-09-20 12:42 +# Generated by Django 4.0.2 on 2022-05-03 13:41 from django.db import migrations, models @@ -7,43 +7,24 @@ class Migration(migrations.Migration): initial = True - dependencies = [ - ] + dependencies = [] 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.CreateModel( - name='Movie', + name="Movie", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255)), - ('description', models.TextField()), - ('duration', models.IntegerField()), - ('actors', models.ManyToManyField(blank=True, related_name='movies', to='cinema.actor')), - ('genres', models.ManyToManyField(blank=True, related_name='movies', to='cinema.genre')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(max_length=255)), + ("description", models.TextField()), + ("duration", models.IntegerField()), ], ), ] diff --git a/cinema/serializers.py b/cinema/serializers.py index e926f0985..e6500624d 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -12,7 +12,9 @@ def create(self, validated_data): def update(self, instance, validated_data): instance.name = validated_data.get("name", instance.name) + instance.save() + return instance @@ -33,7 +35,9 @@ def update(self, instance, validated_data): "last_name", instance.last_name ) + instance.save() + return instance @@ -53,7 +57,9 @@ def update(self, instance, validated_data): "seats_in_row", instance.seats_in_row ) + instance.save() + return instance @@ -72,5 +78,7 @@ def update(self, instance, validated_data): "description", instance.description ) instance.duration = validated_data.get("duration", instance.duration) + instance.save() + return instance diff --git a/cinema/urls.py b/cinema/urls.py index 8ba00cb96..ff72134d4 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,5 +1,4 @@ from django.urls import path, include - from rest_framework import routers from cinema.views import ( @@ -11,7 +10,6 @@ MovieViewSet, ) - router = routers.DefaultRouter() router.register("movies", MovieViewSet) @@ -26,7 +24,6 @@ "delete": "destroy" }) - urlpatterns = [ path("", include(router.urls)), path("genres/", GenreList.as_view(), name="genre-list"), From 826e4ea07d7167cbbd227d5ad9cacf2dcb56fe59 Mon Sep 17 00:00:00 2001 From: Oleh Date: Fri, 20 Sep 2024 16:38:40 +0300 Subject: [PATCH 5/5] Solution --- ...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..8f5a80a5e --- /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-20 13:32 + +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(blank=True, related_name='movies', to='cinema.actor'), + ), + migrations.AddField( + model_name='movie', + name='genres', + field=models.ManyToManyField(blank=True, related_name='movies', to='cinema.genre'), + ), + ]