Skip to content
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' #713

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions cinema/models.py
Original file line number Diff line number Diff line change
@@ -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)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rows field has a default value of None, which is not appropriate for an IntegerField. Consider setting a valid default value or allowing null values by setting null=True.

seats_in_row = models.IntegerField(default=None)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting default=None for IntegerField is not appropriate. Consider removing the default parameter or setting it to a valid integer value. If you want to allow null values, use null=True instead.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The seats_in_row field has a default value of None, which is not appropriate for an IntegerField. Consider setting a valid default value or allowing null values by setting null=True.


def __str__(self):
return self.name
55 changes: 54 additions & 1 deletion cinema/serializers.py
Original file line number Diff line number Diff line change
@@ -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):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using serializers.ModelSerializer instead of serializers.Serializer for GenreSerializer. This will automatically generate the create and update methods and reduce boilerplate code.

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):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using serializers.ModelSerializer for ActorSerializer to simplify the code and automatically handle model fields.

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):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using serializers.ModelSerializer for MovieSerializer would be beneficial as it reduces the need for manual create and update methods.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MovieSerializer is missing fields for actors and genres, which are many-to-many relationships in the Movie model. Consider adding these fields to ensure the serializer fully represents the model.

Expand All @@ -22,3 +55,23 @@ def update(self, instance, validated_data):
instance.save()

return instance


class CinemaHallSerializer(serializers.Serializer):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using serializers.ModelSerializer for CinemaHallSerializer to leverage automatic field handling and reduce boilerplate code.

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
38 changes: 34 additions & 4 deletions cinema/urls.py
Original file line number Diff line number Diff line change
@@ -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/<int:pk>/", movie_detail, name="movie-detail"),
path("genres/", GenreList.as_view(), name="genre-list"),
path("genres/<int:pk>/", GenreDetail.as_view(), name="genre-detail"),
path("actors/", ActorList.as_view(), name="actor-list"),
path("actors/<int:pk>/", ActorDetail.as_view(), name="actor-detail"),
path("cinema_halls/", cinema_hall_list, name="cinema-hall-list"),
path(
"cinema_halls/<int:pk>/",
cinema_hall_detail,
name="cinema-hall-detail"
),
path("", include(router.urls)),
]

app_name = "cinema"
123 changes: 92 additions & 31 deletions cinema/views.py
Original file line number Diff line number Diff line change
@@ -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:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using generics.ListCreateAPIView for GenreList to simplify the code and reduce boilerplate.

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):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using generics.RetrieveUpdateDestroyAPIView for GenreDetail to streamline the implementation.

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
Loading