-
Notifications
You must be signed in to change notification settings - Fork 738
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 #724
base: master
Are you sure you want to change the base?
Develop #724
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,52 @@ | ||
# Generated by Django 4.1 on 2024-11-25 15:18 | ||
|
||
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.PositiveIntegerField()), | ||
('seats_in_row', models.PositiveIntegerField()), | ||
], | ||
), | ||
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.AlterField( | ||
model_name='movie', | ||
name='duration', | ||
field=models.PositiveIntegerField(), | ||
), | ||
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'), | ||
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. The |
||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,36 @@ | ||
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 CinemaHall(models.Model): | ||
name = models.CharField(max_length=255) | ||
rows = models.PositiveIntegerField() | ||
seats_in_row = models.PositiveIntegerField() | ||
|
||
def __str__(self): | ||
return self.name | ||
|
||
|
||
class Movie(models.Model): | ||
Sonemon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
title = models.CharField(max_length=255) | ||
description = models.TextField() | ||
duration = models.IntegerField() | ||
actors = models.ManyToManyField(Actor) | ||
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. The |
||
genres = models.ManyToManyField(Genre) | ||
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. The |
||
duration = models.PositiveIntegerField() | ||
|
||
def __str__(self): | ||
return self.title |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,59 @@ | ||
from rest_framework import serializers | ||
from cinema.models import Movie, Genre, Actor, CinemaHall | ||
|
||
from cinema.models import Movie | ||
|
||
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): | ||
Sonemon marked this conversation as resolved.
Show resolved
Hide resolved
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. The |
||
|
@@ -13,12 +66,17 @@ def create(self, validated_data): | |
return Movie.objects.create(**validated_data) | ||
|
||
def update(self, instance, validated_data): | ||
instance.title = validated_data.get("title", instance.title) | ||
instance.title = validated_data.get( | ||
"title", | ||
instance.title | ||
) | ||
instance.description = validated_data.get( | ||
"description", instance.description | ||
"description", | ||
instance.description | ||
) | ||
instance.duration = validated_data.get( | ||
"duration", | ||
instance.duration | ||
) | ||
instance.duration = validated_data.get("duration", instance.duration) | ||
|
||
instance.save() | ||
|
||
return instance |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,41 @@ | ||
from django.urls import path | ||
from django.urls import path, include | ||
from rest_framework.routers import DefaultRouter | ||
|
||
from cinema.views import movie_list, movie_detail | ||
from cinema.views import ( | ||
GenreList, | ||
GenreDetail, | ||
ActorList, | ||
ActorDetail, | ||
CinemaHallViewSet, | ||
MovieViewSet, | ||
) | ||
|
||
router = 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", | ||
}) | ||
|
||
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" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,84 @@ | ||
from rest_framework.decorators import api_view | ||
from rest_framework.views import APIView | ||
from rest_framework import viewsets, mixins, generics | ||
from cinema.models import Movie, Genre, Actor, CinemaHall | ||
from cinema.serializers import ( | ||
MovieSerializer, | ||
GenreSerializer, | ||
ActorSerializer, | ||
CinemaHallSerializer | ||
) | ||
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 | ||
|
||
|
||
@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): | ||
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) | ||
def post(self, request): | ||
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) | ||
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): | ||
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): | ||
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) | ||
|
||
def patch(self, request, pk): | ||
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) | ||
|
||
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.ListCreateAPIView): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
|
||
|
||
class ActorDetail(generics.RetrieveUpdateDestroyAPIView): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
|
||
|
||
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 |
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.
The
ManyToManyField
foractors
in theMovie
model is missing arelated_name
. According to the task requirements, you should define arelated_name
to manage reverse relationships effectively.