-
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 #355
Open
denys-source
wants to merge
1
commit into
mate-academy:master
Choose a base branch
from
denys-source: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 #355
Changes from all commits
Commits
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
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 |
---|---|---|
|
@@ -7,4 +7,6 @@ venv/ | |
.pytest_cache/ | ||
**__pycache__/ | ||
*.pyc | ||
db.sqlite3 | ||
db.sqlite3 | ||
.mypy.ini | ||
pyrightconfig.json |
79 changes: 79 additions & 0 deletions
79
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,79 @@ | ||
# Generated by Django 4.1 on 2023-10-10 13:04 | ||
|
||
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=63)), | ||
("last_name", models.CharField(max_length=63)), | ||
], | ||
options={ | ||
"ordering": ("first_name",), | ||
}, | ||
), | ||
migrations.CreateModel( | ||
name="CinemaHall", | ||
fields=[ | ||
( | ||
"id", | ||
models.BigAutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("name", models.CharField(max_length=63)), | ||
("rows", models.PositiveIntegerField()), | ||
("seats_in_row", models.PositiveIntegerField()), | ||
], | ||
options={ | ||
"ordering": ("name",), | ||
}, | ||
), | ||
migrations.CreateModel( | ||
name="Genre", | ||
fields=[ | ||
( | ||
"id", | ||
models.BigAutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("name", models.CharField(max_length=63, unique=True)), | ||
], | ||
options={ | ||
"ordering": ("name",), | ||
}, | ||
), | ||
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 |
---|---|---|
@@ -1,10 +1,45 @@ | ||
from django.db import models | ||
|
||
|
||
class Actor(models.Model): | ||
first_name = models.CharField(max_length=63) | ||
last_name = models.CharField(max_length=63) | ||
|
||
class Meta: | ||
ordering = ("first_name",) | ||
|
||
def __str__(self) -> str: | ||
return f"{self.first_name} {self.last_name}" | ||
|
||
|
||
class Genre(models.Model): | ||
name = models.CharField(max_length=63, unique=True) | ||
|
||
class Meta: | ||
ordering = ("name",) | ||
|
||
def __str__(self) -> str: | ||
return self.name | ||
|
||
|
||
class CinemaHall(models.Model): | ||
name = models.CharField(max_length=63) | ||
rows = models.PositiveIntegerField() | ||
seats_in_row = models.PositiveIntegerField() | ||
|
||
class Meta: | ||
ordering = ("name",) | ||
|
||
def __str__(self) -> str: | ||
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): | ||
def __str__(self) -> str: | ||
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,24 +1,27 @@ | ||
from rest_framework import serializers | ||
|
||
from cinema.models import Movie | ||
from cinema.models import Actor, CinemaHall, Genre, Movie | ||
|
||
|
||
class MovieSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
title = serializers.CharField(max_length=255) | ||
description = serializers.CharField() | ||
duration = serializers.IntegerField() | ||
class MovieSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = Movie | ||
fields = ("id", "title", "description", "duration") | ||
|
||
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.description = validated_data.get( | ||
"description", instance.description | ||
) | ||
instance.duration = validated_data.get("duration", instance.duration) | ||
class ActorSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = Actor | ||
fields = ("id", "first_name", "last_name") | ||
|
||
instance.save() | ||
|
||
return instance | ||
class GenreSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = Genre | ||
fields = ("id", "name") | ||
|
||
|
||
class CinemaHallSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = CinemaHall | ||
fields = ("id", "name", "rows", "seats_in_row") |
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,41 @@ | ||
from django.urls import path | ||
from rest_framework.routers import SimpleRouter | ||
|
||
from cinema.views import movie_list, movie_detail | ||
from django.urls import include, path | ||
|
||
from cinema.views import ( | ||
CinemaHallViewSet, | ||
GenreDetail, | ||
GenreList, | ||
ActorList, | ||
ActorDetail, | ||
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", | ||
} | ||
) | ||
|
||
router = SimpleRouter() | ||
router.register("movies", MovieViewSet) | ||
|
||
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" |
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,122 @@ | ||
from rest_framework.decorators import api_view | ||
from rest_framework.views import APIView | ||
from rest_framework.mixins import ( | ||
ListModelMixin, | ||
CreateModelMixin, | ||
RetrieveModelMixin, | ||
UpdateModelMixin, | ||
DestroyModelMixin, | ||
) | ||
from rest_framework.generics import GenericAPIView | ||
from rest_framework.response import Response | ||
from rest_framework.request import Request | ||
from rest_framework import status | ||
|
||
from django.shortcuts import get_object_or_404 | ||
from rest_framework.viewsets import GenericViewSet, ModelViewSet | ||
|
||
from cinema.models import Movie | ||
from cinema.serializers import MovieSerializer | ||
from cinema.models import CinemaHall, Genre, Movie, Actor | ||
from cinema.serializers import ( | ||
CinemaHallSerializer, | ||
GenreSerializer, | ||
MovieSerializer, | ||
ActorSerializer, | ||
) | ||
|
||
|
||
@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: 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: Request) -> Response: | ||
serializer = GenreSerializer(data=request.data) | ||
if serializer.is_valid(): | ||
serializer.save() | ||
return Response(serializer.data, status=status.HTTP_201_CREATED) | ||
|
||
return Response( | ||
serializer.validated_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: int) -> Genre: | ||
genre = get_object_or_404(Genre, pk=pk) | ||
return genre | ||
|
||
if request.method == "GET": | ||
serializer = MovieSerializer(movie) | ||
def get(self, request: Request, pk: int) -> 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: Request, pk: int) -> 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.validated_data, status=status.HTTP_200_OK | ||
) | ||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) | ||
|
||
def patch(self, request: Request, pk: int) -> Response: | ||
genre = self.get_object(pk) | ||
serializer = GenreSerializer(genre, data=request.data, partial=True) | ||
if serializer.is_valid(): | ||
serializer.save() | ||
return Response( | ||
serializer.validated_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: Request, pk: int) -> Response: | ||
genre = self.get_object(pk) | ||
genre.delete() | ||
return Response(status=status.HTTP_204_NO_CONTENT) | ||
|
||
|
||
class ActorList(ListModelMixin, CreateModelMixin, GenericAPIView): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
|
||
def get(self, request: Request, *args, **kwargs) -> Response: | ||
return self.list(request, *args, **kwargs) | ||
|
||
def post(self, request: Request, *args, **kwargs) -> Response: | ||
return self.create(request, *args, **kwargs) | ||
|
||
|
||
class ActorDetail( | ||
RetrieveModelMixin, UpdateModelMixin, DestroyModelMixin, GenericAPIView | ||
): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
|
||
def get(self, request: Request, *args, **kwargs) -> Response: | ||
return self.retrieve(request, *args, **kwargs) | ||
|
||
def put(self, request: Request, *args, **kwargs) -> Response: | ||
return self.update(request, *args, **kwargs) | ||
|
||
def patch(self, request: Request, *args, **kwargs) -> Response: | ||
return self.partial_update(request, *args, **kwargs) | ||
|
||
def delete(self, request: Request, *args, **kwargs) -> Response: | ||
return self.destroy(request, *args, **kwargs) | ||
|
||
|
||
class CinemaHallViewSet( | ||
ListModelMixin, | ||
RetrieveModelMixin, | ||
CreateModelMixin, | ||
UpdateModelMixin, | ||
DestroyModelMixin, | ||
GenericViewSet, | ||
): | ||
queryset = CinemaHall.objects.all() | ||
serializer_class = CinemaHallSerializer | ||
|
||
|
||
class MovieViewSet(ModelViewSet): | ||
queryset = Movie.objects.all() | ||
serializer_class = MovieSerializer |
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.
you can simplify your code with raise_exception=True https://stackoverflow.com/questions/40348981/django-rest-framework-raise-exception-true