-
Notifications
You must be signed in to change notification settings - Fork 723
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Solution #707
base: master
Are you sure you want to change the base?
Solution #707
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Generated by Django 4.1 on 2024-10-23 16:10 | ||
|
||
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(related_name='movies', to='cinema.actor'), | ||
), | ||
migrations.AddField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.genre'), | ||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,83 @@ | ||
from rest_framework import serializers | ||
|
||
from cinema.models import Movie | ||
from cinema.models import Movie, Actor, Genre, CinemaHall | ||
|
||
|
||
class MovieSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
title = serializers.CharField(max_length=255) | ||
description = serializers.CharField() | ||
duration = serializers.IntegerField() | ||
class MovieSerializer(serializers.ModelSerializer): | ||
actors = serializers.PrimaryKeyRelatedField(many=True, | ||
queryset=Actor.objects.all()) | ||
genres = serializers.PrimaryKeyRelatedField(many=True, | ||
queryset=Genre.objects.all()) | ||
|
||
class Meta: | ||
model = Movie | ||
fields = ['id', 'title', "duration", "actors", "genres"] | ||
|
||
def create(self, validated_data): | ||
return Movie.objects.create(**validated_data) | ||
actors = validated_data.pop("actors") | ||
genres = validated_data.pop("genres") | ||
movies = Movie.objects.create(**validated_data) | ||
movies.set(actors) | ||
movies.set(genres) | ||
Comment on lines
+20
to
+21
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is an error here. The 'set' method should be called on the ManyToMany fields 'actors' and 'genres', not directly on the 'movies' instance. You should use 'movies.actors.set(actors)' and 'movies.genres.set(genres)'. |
||
return movies | ||
|
||
def update(self, instance, validated_data): | ||
actors = validated_data.pop("actors") | ||
genres = validated_data.pop("genres") | ||
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.genres = validated_data.get("genres", instance.genres) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the update method, directly assigning ManyToMany fields like 'instance.genres = ...' is incorrect. Instead, use 'instance.genres.set(genres)' to update the ManyToMany relationships. |
||
instance.save() | ||
if actors is not None: | ||
instance.actors.set(actors) | ||
if genres is not None: | ||
instance.genres.set(genres) | ||
return instance | ||
|
||
|
||
class ActorSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = Actor | ||
fields = ["id", "first_name", "last_name"] | ||
|
||
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 GenreSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = Genre | ||
fields = ["id", "name"] | ||
|
||
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 CinemaHallSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = CinemaHall | ||
fields = ["id", "name", "rows", "seats_in_row"] | ||
|
||
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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,38 @@ | ||
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 (GenreDetail, | ||
GenreList, | ||
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": "partial_update", | ||
"delete": "destroy" | ||
}) | ||
|
||
urlpatterns = [ | ||
path("movies/", movie_list, name="movie-list"), | ||
path("movies/<int:pk>/", movie_detail, name="movie-detail"), | ||
path("genres/", GenreList.as_view(), name="genres-list"), | ||
path("genres/<int:pk>/", GenreDetail.as_view(), name="genres-detail"), | ||
path("actors/", ActorList.as_view(), name="actors-list"), | ||
path("actors/<int:pk>/", ActorDetail.as_view(), name="actors-detail"), | ||
path("cinemahalls/", cinema_hall_list, name="cinema-halls-list"), | ||
path("cinemahalls/<int:pk>/", cinema_hall_detail, name="cinema-halls-detail"), | ||
path("", include(router.urls)), | ||
] | ||
|
||
app_name = "cinema" | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,69 @@ | ||
from rest_framework.decorators import api_view | ||
from rest_framework.response import Response | ||
from rest_framework import status | ||
from rest_framework import generics | ||
from rest_framework import viewsets, mixins | ||
|
||
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, Genre, Actor, CinemaHall | ||
from cinema.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 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) | ||
def post(self, request) -> Response: | ||
serializer = GenreSerializer(data=request.data) | ||
if serializer.is_valid(): | ||
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) | ||
|
||
if request.method == "GET": | ||
serializer = MovieSerializer(movie) | ||
class GenreDetail(APIView): | ||
def get_object(self, pk: int) -> Genre: | ||
return get_object_or_404(Genre, pk) | ||
|
||
def get(self, request, pk: int) -> Response: | ||
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) | ||
def put(self, request, pk: int) -> Response: | ||
serializer = GenreSerializer(self.get_object(pk), data=request.data) | ||
if serializer.is_valid(): | ||
serializer.save() | ||
return Response(serializer.data, status=status.HTTP_200_OK) | ||
return Response(serializer.data, status=status.HTTP_400_BAD_REQUEST) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the put method of GenreDetail, the serializer's save method is missing after checking if the serializer is valid. You should call 'serializer.save()' before returning the response with the serialized data. |
||
|
||
Comment on lines
39
to
+40
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the put method of GenreDetail, the serializer's save method is missing. You need to call 'serializer.save()' before returning the response to ensure that the updates are saved to the database. |
||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) | ||
|
||
if request.method == "DELETE": | ||
movie.delete() | ||
def delete(self, request, pk: int) -> Response: | ||
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(viewsets.GenericViewSet, | ||
mixins.ListModelMixin, | ||
mixins.CreateModelMixin, | ||
mixins.DestroyModelMixin, | ||
mixins.RetrieveModelMixin, | ||
mixins.UpdateModelMixin): | ||
queryset = CinemaHall.objects.all() | ||
serializer_class = CinemaHallSerializer | ||
|
||
|
||
class MovieViewSet(viewsets.ModelViewSet): | ||
queryset = Movie.objects.all() | ||
serializer_class = MovieSerializer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is an error in the create method. The correct method to add ManyToMany relationships is to use 'set' on the related manager, e.g., 'movies.actors.set(actors)' and 'movies.genres.set(genres)'. The current code attempts to call 'set' directly on the Movie instance, which is incorrect.