-
Notifications
You must be signed in to change notification settings - Fork 722
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
base: master
Are you sure you want to change the base?
Develop #772
Changes from all commits
05676d4
855ff42
a570f5d
e72e69f
81bc450
38a927f
d7fcfac
f0fd6ca
3547827
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 |
---|---|---|
@@ -1,10 +1,38 @@ | ||
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}" | ||
|
||
|
||
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}:" | ||
f"({', '.join(genre.name for genre in self.genres.all())}, " | ||
f"{self.duration})") |
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): | ||
|
@@ -22,3 +27,57 @@ def update(self, instance, validated_data): | |
instance.save() | ||
|
||
return instance | ||
|
||
|
||
class ActorSerializer(serializers.Serializer): | ||
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. Consider using |
||
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): | ||
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. Consider using |
||
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): | ||
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. Consider using |
||
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 |
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 | ||
|
||
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" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,108 @@ | ||
from rest_framework.decorators import api_view | ||
from django.shortcuts import get_object_or_404 | ||
from rest_framework import status, generics, mixins, viewsets | ||
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): | ||
def get(self, 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) | ||
def post(self, 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): | ||
def get_object(self, 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 |
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.
Consider using
serializers.ModelSerializer
for theMovieSerializer
class. This would automatically generate thecreate
andupdate
methods based on the model fields, reducing boilerplate code.