-
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
Solution #753
Open
MrEgorLite
wants to merge
3
commits into
mate-academy:master
Choose a base branch
from
MrEgorLite:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Solution #753
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
47 changes: 47 additions & 0 deletions
47
cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Generated by Django 4.1 on 2024-12-10 10:29 | ||
|
||
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=50)), | ||
('last_name', models.CharField(max_length=50)), | ||
], | ||
), | ||
migrations.CreateModel( | ||
name='CinemaHall', | ||
fields=[ | ||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('name', models.CharField(max_length=50)), | ||
('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=50)), | ||
], | ||
), | ||
migrations.AddField( | ||
model_name='movie', | ||
name='actors', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.actor'), | ||
), | ||
migrations.AddField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.genre'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 4.1 on 2024-12-10 12:20 | ||
|
||
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='genre', | ||
name='name', | ||
field=models.CharField(max_length=50, unique=True), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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=50, unique=True) | ||
|
||
def __str__(self): | ||
return self.name | ||
|
||
|
||
class Actor(models.Model): | ||
first_name = models.CharField(max_length=50) | ||
last_name = models.CharField(max_length=50) | ||
|
||
|
||
class CinemaHall(models.Model): | ||
name = models.CharField(max_length=50) | ||
rows = models.IntegerField() | ||
seats_in_row = models.IntegerField() | ||
|
||
def __str__(self): | ||
return self.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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,61 @@ | ||
from rest_framework import serializers | ||
|
||
from cinema.models import Movie | ||
from cinema.models import Movie, Actor, CinemaHall, Genre | ||
|
||
|
||
class ActorSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
first_name = serializers.CharField(max_length=50) | ||
last_name = serializers.CharField(max_length=50) | ||
|
||
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): | ||
id = serializers.IntegerField(read_only=True) | ||
name = serializers.CharField(max_length=50) | ||
|
||
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 MovieSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
title = serializers.CharField(max_length=255) | ||
description = serializers.CharField() | ||
duration = serializers.IntegerField() | ||
actors = serializers.SlugRelatedField( | ||
many=True, | ||
read_only=True, | ||
slug_field="id" | ||
) | ||
genres = serializers.SlugRelatedField( | ||
many=True, | ||
read_only=True, | ||
slug_field="id" | ||
) | ||
|
||
def create(self, validated_data): | ||
return Movie.objects.create(**validated_data) | ||
Comment on lines
60
to
61
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 |
||
|
@@ -22,3 +70,25 @@ def update(self, instance, validated_data): | |
instance.save() | ||
|
||
return instance | ||
|
||
|
||
class CinemaHallSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
name = serializers.CharField(max_length=50) | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,47 @@ | ||
from django.urls import path | ||
|
||
from cinema.views import movie_list, movie_detail | ||
from django.urls import path, include | ||
from rest_framework import routers | ||
|
||
from cinema.views import ( | ||
GenreList, | ||
GenreDetail, | ||
ActorList, | ||
ActorDetail, | ||
CinemaHallViewSet, | ||
MovieViewSet, | ||
) | ||
|
||
|
||
router = routers.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("", include(router.urls)), | ||
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-halls"), | ||
path( | ||
"cinema_halls/<int:pk>/", | ||
cinema_hall_detail, | ||
name="cinema-hall-detail" | ||
), | ||
] | ||
|
||
app_name = "cinema" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,111 @@ | ||
from rest_framework.decorators import api_view | ||
from rest_framework.generics import GenericAPIView | ||
from rest_framework.response import Response | ||
from rest_framework import status | ||
from rest_framework import status, mixins, viewsets | ||
|
||
from django.shortcuts import get_object_or_404 | ||
from rest_framework.views import APIView | ||
|
||
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) | ||
return Response(serializer.data, status=status.HTTP_200_OK) | ||
class MovieViewSet(viewsets.ModelViewSet): | ||
queryset = Movie.objects.all() | ||
serializer_class = MovieSerializer | ||
|
||
|
||
if request.method == "POST": | ||
serializer = MovieSerializer(data=request.data) | ||
if serializer.is_valid(): | ||
serializer.save() | ||
return Response(serializer.data, status=status.HTTP_201_CREATED) | ||
class GenreList(APIView): | ||
def get(self, request): | ||
genres = Genre.objects.all() | ||
serializer = GenreSerializer(genres, many=True) | ||
return Response(serializer.data, status=status.HTTP_200_OK) | ||
|
||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) | ||
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) | ||
|
||
|
||
@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) | ||
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, 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) | ||
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): | ||
genre = self.get_object(pk) | ||
genre.delete() | ||
return Response(status=status.HTTP_204_NO_CONTENT) | ||
|
||
|
||
class ActorList( | ||
mixins.ListModelMixin, | ||
mixins.CreateModelMixin, | ||
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, | ||
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 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Genre
model should have a unique constraint on thename
field to prevent duplicate entries. You can addunique=True
to theCharField
definition forname
.