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

first #684

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

first #684

Show file tree
Hide file tree
Changes from 4 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
7 changes: 6 additions & 1 deletion cinema/admin.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
from django.contrib import admin

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


@admin.register(Movie)
class MovieAdmin(admin.ModelAdmin):
pass
Copy link

Choose a reason for hiding this comment

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

let's use admin.site.register instead



admin.site.register(Genre)
admin.site.register(Actor)
admin.site.register(CinemaHall)
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Generated by Django 4.1 on 2024-09-28 08:28

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(to='cinema.actor'),
),
migrations.AddField(
model_name='movie',
name='genres',
field=models.ManyToManyField(to='cinema.genre'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Generated by Django 4.1 on 2024-09-28 09:28

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('cinema', '0002_actor_cinemahall_genre_movie_actors_movie_genres'),
]

operations = [
migrations.AlterField(
model_name='actor',
name='first_name',
field=models.CharField(max_length=30),
),
migrations.AlterField(
model_name='actor',
name='last_name',
field=models.CharField(max_length=30),
),
migrations.AlterField(
model_name='cinemahall',
name='name',
field=models.CharField(max_length=25),
),
migrations.AlterField(
model_name='genre',
name='name',
field=models.CharField(max_length=30, unique=True),
),
migrations.AlterField(
model_name='movie',
name='actors',
field=models.ManyToManyField(related_name='movies', to='cinema.actor'),
),
migrations.AlterField(
model_name='movie',
name='genres',
field=models.ManyToManyField(related_name='movies', to='cinema.genre'),
),
]
23 changes: 23 additions & 0 deletions cinema/models.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
from django.db import models


class Genre(models.Model):
name = models.CharField(max_length=30, unique=True)

def __str__(self):
return self.name


class Actor(models.Model):
first_name = models.CharField(max_length=30)
last_name = models.CharField(max_length=30)

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()
genres = models.ManyToManyField(Genre, related_name="movies")
actors = models.ManyToManyField(Actor, related_name="movies")

def __str__(self):
return self.title


class CinemaHall(models.Model):
name = models.CharField(max_length=25)
rows = models.IntegerField()
seats_in_row = models.IntegerField()
55 changes: 54 additions & 1 deletion cinema/serializers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from rest_framework import serializers

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


class MovieSerializer(serializers.Serializer):
Expand All @@ -18,6 +18,59 @@ def update(self, instance, validated_data):
"description", instance.description
)
instance.duration = validated_data.get("duration", instance.duration)
instance.save()

return instance


class CinemaHallSerializer(serializers.Serializer):
name = serializers.CharField(max_length=25)

Choose a reason for hiding this comment

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

If you don't include the id field, the API responses for actors will not show the id, and you won't be able to use it for updates or references in related models (like for associating an actor with a movie). This can be problematic if you're dealing with many-to-many relationships or need to update or delete specific actor records.
Add id field in every serializer

rows = serializers.IntegerField()
seats_in_row = serializers.IntegerField()

def create(self, validated_data):

Choose a reason for hiding this comment

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

Add type hints for parameters and return in each file and function

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 GenreSerializer(serializers.Serializer):
name = serializers.CharField(max_length=25)

Choose a reason for hiding this comment

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

It's recommended to maintain the same max_length for both models and serializers.
Also fix in Actor

Choose a reason for hiding this comment

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

Having different max_length constraints in your Django model and serializer can lead to inconsistencies and potential issues. Fix it everywhere.


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):
first_name = serializers.CharField(max_length=63)
last_name = serializers.CharField(max_length=63)

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

Expand Down
44 changes: 40 additions & 4 deletions cinema/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,46 @@
from django.urls import path
from django.urls import path, include
from rest_framework import routers

Copy link

Choose a reason for hiding this comment

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

1 blank line between different groups of imports

from cinema.views import movie_list, movie_detail
from cinema.views import (
MovieViewSet,
GenreList,
GenreDetail,
ActorList,
ActorDetail,
CinemaHallViewSet
)

cinema_hall_detail = CinemaHallViewSet.as_view(
actions={
"get": "retrieve",
"put": "update",
"patch": "partial_update",
"delete": "destroy"
}
)

cinema_hall_list = CinemaHallViewSet.as_view(
actions={
"get": "list",
"post": "create"
}
)

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("", include(router.urls)),
path("genres/", GenreList.as_view(), name="genres-list"),
path("genres/<int:pk>/", GenreDetail.as_view(), name="genre-detail"),
path("actors/", ActorList.as_view(), name="actors"),
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"
)
]

app_name = "cinema"
112 changes: 90 additions & 22 deletions cinema/views.py
Original file line number Diff line number Diff line change
@@ -1,45 +1,113 @@
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

Copy link

Choose a reason for hiding this comment

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

reorder imports alphabetically

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)

Choose a reason for hiding this comment

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

and here (serializer.is_valid(raise_exception=True))

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(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)
def put(self, request, pk) -> Response:
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)

Choose a reason for hiding this comment

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

You can use shorter version here (from our previous task):
serializer.is_valid(raise_exception=True)
serializer.save()
return Response(serializer.data, status=status.HTTP_200_OK)

if request.method == "DELETE":
movie.delete()
def delete(self, request, pk) -> Response:
genre = self.get_object(pk)
genre.delete()
return Response(status=status.HTTP_204_NO_CONTENT)

def patch(self, request, pk) -> Response:
genre = self.get_object(pk)
serializer = GenreSerializer(genre, data=request.data, partial=True)
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)

Choose a reason for hiding this comment

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

and here



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)

Comment on lines +66 to +70

Choose a reason for hiding this comment

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

The same here


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)

Comment on lines +83 to +93

Choose a reason for hiding this comment

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

Redundant code: you have already had this methods


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