diff --git a/cinema/admin.py b/cinema/admin.py index 06a2c4616..3b2db5568 100644 --- a/cinema/admin.py +++ b/cinema/admin.py @@ -1,6 +1,21 @@ from django.contrib import admin -from cinema.models import Movie +from cinema.models import Actor, Genre, CinemaHall, Movie + + +@admin.register(Actor) +class ActorAdmin(admin.ModelAdmin): + pass + + +@admin.register(Genre) +class GenreAdmin(admin.ModelAdmin): + pass + + +@admin.register(CinemaHall) +class CinemaHallAdmin(admin.ModelAdmin): + pass @admin.register(Movie) diff --git a/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py new file mode 100644 index 000000000..db43b3f53 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,71 @@ +# Generated by Django 4.1 on 2026-04-10 12:03 + +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()), + ("seat_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"), + ), + ] diff --git a/cinema/migrations/0003_rename_seat_in_row_cinemahall_seats_in_row.py b/cinema/migrations/0003_rename_seat_in_row_cinemahall_seats_in_row.py new file mode 100644 index 000000000..fd7f334aa --- /dev/null +++ b/cinema/migrations/0003_rename_seat_in_row_cinemahall_seats_in_row.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1 on 2026-04-10 12:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("cinema", "0002_actor_cinemahall_genre_movie_actors_movie_genres"), + ] + + operations = [ + migrations.RenameField( + model_name="cinemahall", + old_name="seat_in_row", + new_name="seats_in_row", + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..728312429 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,10 +1,36 @@ from django.db import models +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 Genre(models.Model): + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=255) + 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() duration = models.IntegerField() + actors = models.ManyToManyField(Actor, related_name="movies") + genres = models.ManyToManyField(Genre, related_name="movies") def __str__(self): return self.title diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..55d7f197c 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,6 +1,71 @@ from rest_framework import serializers -from cinema.models import Movie +from cinema.models import Actor, Genre, CinemaHall, Movie + + +class ActorSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(read_only=True) + first_name = serializers.CharField(max_length=255) + last_name = serializers.CharField(max_length=255) + + class Meta: + model = Actor + fields = ("id", "first_name", "last_name") + + 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.ModelSerializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + + class Meta: + model = Genre + fields = ("id", "name") + + 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.ModelSerializer): + id = serializers.IntegerField(read_only=True) + name = serializers.CharField(max_length=255) + rows = serializers.IntegerField() + seats_in_row = serializers.IntegerField() + + class Meta: + model = CinemaHall + fields = ("id", "name", "rows", "seats_in_row") + + 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): @@ -8,17 +73,35 @@ class MovieSerializer(serializers.Serializer): title = serializers.CharField(max_length=255) description = serializers.CharField() duration = serializers.IntegerField() + actors = serializers.PrimaryKeyRelatedField( + many=True, + queryset=Actor.objects.all() + ) + genres = serializers.PrimaryKeyRelatedField( + many=True, + queryset=Genre.objects.all() + ) def create(self, validated_data): - return Movie.objects.create(**validated_data) + actors = validated_data.pop("actors") + genres = validated_data.pop("genres") + movie = Movie.objects.create(**validated_data) + movie.actors.set(actors) + movie.genres.set(genres) + return movie def update(self, instance, validated_data): + actors = validated_data.pop("actors", None) + genres = validated_data.pop("genres", None) 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.save() - + if actors is not None: + instance.actors.set(actors) + if genres is not None: + instance.genres.set(genres) return instance diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..2536e2440 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,29 @@ -from django.urls import path +from django.urls import path, include -from cinema.views import movie_list, movie_detail +from rest_framework.routers import DefaultRouter -urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), -] +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet, +) app_name = "cinema" + +router = DefaultRouter() +router.register("cinema_halls", CinemaHallViewSet) +router.register("movies", MovieViewSet) + +urlpatterns = [ + # Genre + path("genres/", GenreList.as_view(), name="genre-list"), + path("genres//", GenreDetail.as_view(), name="genre-detail"), + # Actor + path("actors/", ActorList.as_view(), name="actor-list"), + path("actors//", ActorDetail.as_view(), name="actor-detail"), + # ViewSet + path("", include(router.urls)), +] diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..50a534785 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,111 @@ -from rest_framework.decorators import api_view -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 +from rest_framework.request import Request +from rest_framework.response import Response +from rest_framework import status, viewsets, mixins, generics +from rest_framework.views import APIView +from cinema.models import Actor, Genre, CinemaHall, Movie +from cinema.serializers import ( + ActorSerializer, + GenreSerializer, + CinemaHallSerializer, + MovieSerializer, +) -@api_view(["GET", "POST"]) -def movie_list(request): - if request.method == "GET": - movies = Movie.objects.all() - serializer = MovieSerializer(movies, many=True) + +# Genre +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) - if serializer.is_valid(): - serializer.save() - return Response(serializer.data, status=status.HTTP_201_CREATED) + def post(self, request: Request) -> Response: + 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(self, request: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=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: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=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: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=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: Request, pk: int) -> Response: + genre = get_object_or_404(Genre, pk=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) +# Actor +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) + + +# CinemaHall +class CinemaHallViewSet( + viewsets.GenericViewSet, + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +# Movie +class MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/cinema_service/settings.py b/cinema_service/settings.py index def98786c..8c01a9bcb 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -15,13 +15,13 @@ # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = ( - "django-insecure-ru6ndfka@95_(lysua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" + "django-insecure-ru6ndfka@95_(lys" + "ua8yhdjq@vpiqgv3yru4r)q3h4_u8x7dfy" ) # SECURITY WARNING: don't run with debug turned on in production! @@ -29,7 +29,6 @@ ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ @@ -73,7 +72,6 @@ WSGI_APPLICATION = "cinema_service.wsgi.application" - # Database # https://docs.djangoproject.com/en/4.0/ref/settings/#databases @@ -84,30 +82,36 @@ } } - # Password validation # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { - "NAME": "django.contrib.auth.password_validation." - "UserAttributeSimilarityValidator", + "NAME": ( + "django.contrib.auth.password_validation." + "UserAttributeSimilarityValidator" + ), }, { - "NAME": "django.contrib.auth.password_validation." - "MinimumLengthValidator", + "NAME": ( + "django.contrib.auth.password_validation." + "MinimumLengthValidator" + ), }, { - "NAME": "django.contrib.auth.password_validation." - "CommonPasswordValidator", + "NAME": ( + "django.contrib.auth.password_validation." + "CommonPasswordValidator" + ), }, { - "NAME": "django.contrib.auth.password_validation." - "NumericPasswordValidator", + "NAME": ( + "django.contrib.auth.password_validation." + "NumericPasswordValidator" + ), }, ] - # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ @@ -119,7 +123,6 @@ USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ diff --git a/manage.py b/manage.py index f64b24321..5045324ac 100755 --- a/manage.py +++ b/manage.py @@ -1,5 +1,6 @@ #!/usr/bin/env python """Django's command-line utility for administrative tasks.""" + import os import sys