diff --git a/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_description_and_more.py b/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_description_and_more.py new file mode 100644 index 000000000..b350fc366 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_description_and_more.py @@ -0,0 +1,81 @@ +# Generated by Django 4.1 on 2024-12-06 13:08 + +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)), + ], + ), + 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.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=63, unique=True)), + ], + ), + migrations.AlterField( + model_name="movie", + name="description", + field=models.CharField(max_length=255, null=True), + ), + migrations.AlterField( + model_name="movie", + name="title", + field=models.CharField(max_length=63), + ), + 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/models.py b/cinema/models.py index cc477513f..e50d25e26 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -1,9 +1,35 @@ from django.db import models +class Actor(models.Model): + first_name = models.CharField(max_length=63) + last_name = models.CharField(max_length=63) + + def __str__(self): + return f"{self.first_name} {self.last_name}" + + +class Genre(models.Model): + name = models.CharField(max_length=63, unique=True) + + def __str__(self): + return self.name + + +class CinemaHall(models.Model): + name = models.CharField(max_length=63) + 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() + title = models.CharField(max_length=63) + description = models.CharField(max_length=255, null=True) + actors = models.ManyToManyField(Actor, related_name="movies") + genres = models.ManyToManyField(Genre, related_name="movies") duration = models.IntegerField() def __str__(self): diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..de5a359af 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,29 @@ from rest_framework import serializers +from .models import Genre, Actor, CinemaHall, Movie -from cinema.models import Movie +class GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = ["id", "name"] -class MovieSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - title = serializers.CharField(max_length=255) - description = serializers.CharField() - duration = serializers.IntegerField() - def create(self, validated_data): - return Movie.objects.create(**validated_data) +class ActorSerializer(serializers.ModelSerializer): + class Meta: + model = Actor + fields = ["id", "first_name", "last_name"] - 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) - instance.save() +class CinemaHallSerializer(serializers.ModelSerializer): + class Meta: + model = CinemaHall + fields = ["id", "name", "rows", "seats_in_row"] - return instance + +class MovieSerializer(serializers.ModelSerializer): + actors = ActorSerializer(many=True, read_only=True) + genres = GenreSerializer(many=True, read_only=True) + + class Meta: + model = Movie + fields = ["id", "title", "description", "actors", "genres", "duration"] diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..8fab71570 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,22 @@ -from django.urls import path +from django.urls import path, include +from rest_framework.routers import DefaultRouter -from cinema.views import movie_list, movie_detail +from .views import (GenreAPIView, + ActorGenericAPIView, + CinemaHallViewSet, + MovieViewSet) + +app_name = "cinema" + +cinema_hall_router = DefaultRouter() +cinema_hall_router.register(r"cinema_halls", CinemaHallViewSet) + +movie_router = DefaultRouter() +movie_router.register(r"movies", MovieViewSet) urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), + path("genres/", GenreAPIView.as_view(), name="genre-list-create"), + path("actors/", ActorGenericAPIView.as_view(), name="actor-list-create"), + path("", include(cinema_hall_router.urls)), + path("", include(movie_router.urls)), ] - -app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..94555198b 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,60 @@ -from rest_framework.decorators import api_view +from rest_framework.views import APIView +from rest_framework.generics import GenericAPIView +from rest_framework.viewsets import GenericViewSet, ModelViewSet 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 - - -@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) - - if request.method == "POST": - serializer = MovieSerializer(data=request.data) +from rest_framework import status, mixins +from rest_framework.routers import DefaultRouter + +from .models import Genre, Actor, CinemaHall, Movie +from .serializers import ( + GenreSerializer, + ActorSerializer, + CinemaHallSerializer, + MovieSerializer, +) + + +class GenreAPIView(APIView): + def get(self, request): + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) + return Response(serializer.data) + + def post(self, request): + serializer = GenreSerializer(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) -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) +class ActorGenericAPIView(GenericAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer - if request.method == "GET": - serializer = MovieSerializer(movie) - return Response(serializer.data, status=status.HTTP_200_OK) + def get(self, request): + actors = self.get_queryset() + serializer = self.get_serializer(actors, many=True) + return Response(serializer.data) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) + def post(self, request): + serializer = self.get_serializer(data=request.data) if serializer.is_valid(): serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) - + return Response(serializer.data, status=status.HTTP_201_CREATED) 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 CinemaHallViewSet( + mixins.ListModelMixin, + mixins.CreateModelMixin, + mixins.RetrieveModelMixin, + GenericViewSet, +): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer + + +class MovieViewSet(ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/cinema_service/settings.py b/cinema_service/settings.py index def98786c..5d850dfa1 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/4.0/ref/settings/ """ +import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -20,14 +21,12 @@ # 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" -) +SECRET_KEY = os.getenv("DJANGO_SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["127.0.0.1", "localhost"] # Application definition @@ -94,16 +93,13 @@ "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", }, ] diff --git a/requirements.txt b/requirements.txt index 99938e15f..56e135547 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ flake8-quotes==3.3.1 flake8-variables-names==0.0.5 pep8-naming==0.13.2 django-debug-toolbar==3.2.4 -djangorestframework==3.13.1 +djangorestframework==3.13.1 \ No newline at end of file