-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Develop #1161
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
base: master
Are you sure you want to change the base?
Develop #1161
Changes from 2 commits
24005eb
e645ad6
6a367af
82092d1
6e18e35
884ba54
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,71 @@ | ||
| # Generated by Django 4.1 on 2026-05-09 18:35 | ||
|
|
||
| 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(related_name="movies", to="cinema.actor"), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="movie", | ||
| name="genres", | ||
| field=models.ManyToManyField(related_name="movies", to="cinema.genre"), | ||
| ), | ||
| ] | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| from rest_framework import serializers | ||
|
|
||
| from cinema.models import Movie | ||
| from cinema.models import Movie, Actor, Genre, CinemaHall | ||
|
|
||
|
|
||
| class MovieSerializer(serializers.Serializer): | ||
| id = serializers.IntegerField(read_only=True) | ||
| actors = serializers.PrimaryKeyRelatedField(many=True, read_only=True) | ||
|
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. ManyToMany fields are |
||
| genres = serializers.PrimaryKeyRelatedField(many=True, read_only=True) | ||
| title = serializers.CharField(max_length=255) | ||
| description = serializers.CharField() | ||
| duration = serializers.IntegerField() | ||
|
|
@@ -14,11 +16,56 @@ def create(self, 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.description = validated_data.get("description", instance.description) | ||
| instance.duration = validated_data.get("duration", instance.duration) | ||
|
|
||
| instance.save() | ||
|
|
||
| return instance | ||
|
Comment on lines
31
to
49
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 |
||
|
|
||
|
|
||
| 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 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 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 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,37 @@ | ||
| 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 ( | ||
| ActorList, | ||
| ActorDetail, | ||
| GenreList, | ||
| GenreDetail, | ||
| CinemaHallViewSet, | ||
| MovieViewSet, | ||
| ) | ||
|
|
||
| cinema_hall_list = CinemaHallViewSet.as_view(actions={"get": "list", "post": "create"}) | ||
|
|
||
| cinema_hall_detail = CinemaHallViewSet.as_view( | ||
|
Comment on lines
+17
to
+20
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. Direct assignment to M2M fields ( |
||
| actions={ | ||
| "get": "retrieve", | ||
| "put": "update", | ||
| "patch": "partial_update", | ||
| "delete": "destroy", | ||
| } | ||
| ) | ||
|
|
||
| routers = routers.DefaultRouter() | ||
| routers.register("movies", MovieViewSet) | ||
|
|
||
| urlpatterns = [ | ||
| path("movies/", movie_list, name="movie-list"), | ||
| path("movies/<int:pk>/", movie_detail, name="movie-detail"), | ||
| path("", include(routers.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-hall-list"), | ||
| path("cinema_halls/<int:pk>/", cinema_hall_detail, name="cinema-hall-detail"), | ||
| ] | ||
|
|
||
| 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 rest_framework.response import Response | ||
| from rest_framework import status | ||
| from rest_framework import status, generics, mixins | ||
|
|
||
| from django.shortcuts import get_object_or_404 | ||
| from rest_framework.views import APIView | ||
| from rest_framework.viewsets import ModelViewSet, GenericViewSet | ||
|
|
||
| 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): | ||
| 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) | ||
| if serializer.is_valid(): | ||
| serializer.save() | ||
| return Response(serializer.data, status=status.HTTP_201_CREATED) | ||
| 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) | ||
|
|
||
| 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) | ||
|
|
||
| @api_view(["GET", "PUT", "DELETE"]) | ||
| def movie_detail(request, pk): | ||
| movie = get_object_or_404(Movie, 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) | ||
| return Response(serializer.data, status=status.HTTP_200_OK) | ||
|
Comment on lines
38
to
+44
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 |
||
|
|
||
| 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) | ||
| return Response(serializer.data, status=status.HTTP_200_OK) | ||
|
Comment on lines
45
to
+51
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 |
||
|
|
||
| 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.GenericAPIView, | ||
| mixins.ListModelMixin, | ||
| mixins.CreateModelMixin, | ||
| ): | ||
| 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( | ||
| generics.GenericAPIView, | ||
| mixins.RetrieveModelMixin, | ||
| mixins.UpdateModelMixin, | ||
| mixins.DestroyModelMixin, | ||
| ): | ||
| queryset = Actor.objects.all() | ||
| serializer_class = ActorSerializer | ||
|
|
||
| def get(self, request, *args, **kwargs): | ||
| return self.retrieve(request, *args, **kwargs) | ||
|
|
||
| def put(self, request, *argh, **kwargs): | ||
| return self.update(request, *argh, **kwargs) | ||
|
|
||
| def patch(self, request, *argh, **kwargs): | ||
| return self.partial_update(request, *argh, **kwargs) | ||
|
|
||
| def delete(self, request, *argh, **kwargs): | ||
| return self.destroy(request, *argh, **kwargs) | ||
|
|
||
|
|
||
| class CinemaHallViewSet( | ||
| mixins.ListModelMixin, | ||
| mixins.CreateModelMixin, | ||
| mixins.RetrieveModelMixin, | ||
| mixins.UpdateModelMixin, | ||
| mixins.DestroyModelMixin, | ||
| GenericViewSet, | ||
| ): | ||
| queryset = CinemaHall.objects.all() | ||
| serializer_class = CinemaHallSerializer | ||
|
|
||
|
|
||
| class MovieViewSet(ModelViewSet): | ||
| queryset = Movie.objects.all() | ||
| serializer_class = MovieSerializer | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| #!/usr/bin/env python | ||
| """Django's command-line utility for administrative tasks.""" | ||
|
|
||
| import os | ||
| import sys | ||
|
|
||
|
|
||
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.
ManyToMany fields cannot be assigned directly like this. After saving the instance, use instance.actors.set(actors) and instance.genres.set(genres) to properly update the M2M relationships. The current code will fail to persist actors and genres to the database.