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

Develop #772

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
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
49 changes: 34 additions & 15 deletions cinema/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.0.2 on 2022-05-03 13:41
# Generated by Django 4.1 on 2024-12-27 22:30

from django.db import migrations, models

Expand All @@ -7,24 +7,43 @@ class Migration(migrations.Migration):

initial = True

dependencies = []
dependencies = [
]

operations = [
migrations.CreateModel(
name="Movie",
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.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()),
('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(related_name='movies', to='cinema.actor')),
('genres', models.ManyToManyField(related_name='movies', to='cinema.genre')),
],
),
]
28 changes: 27 additions & 1 deletion cinema/models.py
Original file line number Diff line number Diff line change
@@ -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}"

Choose a reason for hiding this comment

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

The __str__ method for the Actor model should include a space between the first and last names for better readability. Consider changing it to 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 f"{self.name}:(rows:{self.rows}, seats:{self.seats_in_row})"


class Movie(models.Model):
title = models.CharField(max_length=255)
description = models.TextField()
actors = models.ManyToManyField(Actor, related_name='movies')
genres = models.ManyToManyField(Genre, related_name="movies")
duration = models.IntegerField()

def __str__(self):
return self.title
return f"{self.title}:({self.genres}, {self.duration})"

Choose a reason for hiding this comment

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

In the __str__ method of the Movie model, directly including self.genres will not display the genre names as expected. You might want to use a method to join the genre names into a string, such as ', '.join(genre.name for genre in self.genres.all()).

52 changes: 51 additions & 1 deletion cinema/serializers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
from rest_framework import serializers

from cinema.models import Movie
from cinema.models import (
Movie,
Genre,
Actor,
CinemaHall
)


class MovieSerializer(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 the MovieSerializer class. This would automatically generate the create and update methods based on the model fields, reducing boilerplate code.

Expand All @@ -22,3 +27,48 @@ def update(self, instance, validated_data):
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 the ActorSerializer class to simplify the code by automatically handling the create and update methods.

id = serializers.IntegerField(read_only=True)
first_name = serializers.CharField(max_length=100)
last_name = serializers.CharField(max_length=100)

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.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 the GenreSerializer class to reduce the need for manually defining the create and update methods.

id = serializers.IntegerField(read_only=True)
name = serializers.CharField(max_length=100)

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.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 the CinemaHallSerializer class to automatically handle the create and update methods, simplifying the code.

id = serializers.IntegerField(read_only=True)
name = serializers.CharField(max_length=100)
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
40 changes: 36 additions & 4 deletions cinema/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,42 @@
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 (
GenreList,
GenreDetail,
ActorList,
ActorDetail,
CinemaHallViewSet,
MovieViewSet,
)

router = routers.DefaultRouter()
router.register("movies", MovieViewSet, basename="movies")

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",
})

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("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"
122 changes: 92 additions & 30 deletions cinema/views.py
Original file line number Diff line number Diff line change
@@ -1,45 +1,107 @@
from django.shortcuts import get_object_or_404
from rest_framework import status, generics, mixins, viewsets
from rest_framework.decorators import api_view
from rest_framework.response import Response
from rest_framework import status
from rest_framework.views import APIView

from django.shortcuts import get_object_or_404
from cinema.models import Genre, Actor, CinemaHall, Movie
from cinema.serializers import MovieSerializer, GenreSerializer, ActorSerializer, CinemaHallSerializer

from cinema.models import Movie
from cinema.serializers import MovieSerializer

class GenreList(APIView):
@staticmethod

Choose a reason for hiding this comment

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

The use of @staticmethod for the get and post methods in GenreList is unnecessary. These methods should be instance methods, not static methods, as they rely on the request object.

def get(request):
genre = Genre.objects.all()
serializer = GenreSerializer(genre, many=True)
return Response(serializer.data)

@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)
@staticmethod
def post(request):
serializer = GenreSerializer(data=request.data)
serializer.is_valid(raise_exception=True)
serializer.save()
return Response(serializer.data, status=status.HTTP_201_CREATED)

if request.method == "POST":
serializer = MovieSerializer(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)
class GenreDetail(APIView):
@staticmethod

Choose a reason for hiding this comment

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

Similarly, the @staticmethod decorator is not needed for the get_object method in GenreDetail. It should be an instance method to maintain consistency with Django's class-based views.

def get_object(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)

@api_view(["GET", "PUT", "DELETE"])
def movie_detail(request, pk):
movie = get_object_or_404(Movie, pk=pk)
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)

if request.method == "GET":
serializer = MovieSerializer(movie)
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, 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 delete(self, request, pk):
genre = self.get_object(pk)
genre.delete()
return Response(status=status.HTTP_204_NO_CONTENT)

return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

if request.method == "DELETE":
movie.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 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(
mixins.ListModelMixin,
mixins.CreateModelMixin,
mixins.RetrieveModelMixin,
mixins.UpdateModelMixin,
mixins.DestroyModelMixin,
viewsets.GenericViewSet
):
queryset = CinemaHall.objects.all()
serializer_class = CinemaHallSerializer


class MovieViewSet(viewsets.ModelViewSet):
queryset = Movie.objects.all()
serializer_class = MovieSerializer
Loading