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..714afa112 --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2024-12-10 08:32 + +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'), + ), + ] diff --git a/cinema/models.py b/cinema/models.py index cc477513f..5028ca59c 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 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 diff --git a/cinema/serializers.py b/cinema/serializers.py index 050db5771..b140c875b 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,35 @@ from rest_framework import serializers +from cinema.models import Movie, Actor, Genre, CinemaHall -from cinema.models import Movie +class ActorSerializer(serializers.ModelSerializer): + class Meta: + model = Actor + fields = ["id", "first_name", "last_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 GenreSerializer(serializers.ModelSerializer): + class Meta: + model = Genre + fields = ["id", "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 = serializers.PrimaryKeyRelatedField( + queryset=Actor.objects.all(), + many=True + ) + genres = serializers.PrimaryKeyRelatedField( + queryset=Genre.objects.all(), + many=True + ) + + class Meta: + model = Movie + fields = ["id", "title", "description", "duration", "actors", "genres"] diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..5cbe7c0c8 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,24 @@ -from django.urls import path +from django.urls import path, include +from rest_framework.routers import DefaultRouter +from cinema.views import ( + GenreList, + GenreDetail, + ActorList, + ActorDetail, + CinemaHallViewSet, + MovieViewSet +) -from cinema.views import movie_list, movie_detail +app_name = "cinema" + +router = DefaultRouter() +router.register(r"cinema_halls", CinemaHallViewSet) +router.register(r"movies", MovieViewSet) urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), + path("genres/", GenreList.as_view(), name="genre-list"), + path("genres//", GenreDetail.as_view(), name="genre-detail"), + path("actors/", ActorList.as_view(), name="actor-list"), + path("actors//", ActorDetail.as_view(), name="actor-detail"), + path("", include(router.urls)), ] - -app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..89a620ed3 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,132 @@ -from rest_framework.decorators import api_view -from rest_framework.response import Response +from rest_framework.views import APIView from rest_framework import status +from rest_framework.response import Response +from rest_framework.generics import GenericAPIView +from rest_framework.viewsets import ModelViewSet, GenericViewSet +from rest_framework.mixins import ( + ListModelMixin, + CreateModelMixin, + RetrieveModelMixin, + UpdateModelMixin, + DestroyModelMixin, +) -from django.shortcuts import get_object_or_404 - -from cinema.models import Movie -from cinema.serializers import MovieSerializer +from cinema.models import Movie, Actor, Genre, CinemaHall +from cinema.serializers import ( + MovieSerializer, + ActorSerializer, + GenreSerializer, + 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 GenreList(APIView): + def get(self, request): + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) + return Response(serializer.data) - if request.method == "POST": - serializer = MovieSerializer(data=request.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 GenreDetail(APIView): + def get(self, request, pk): + try: + genre = Genre.objects.get(pk=pk) + except Genre.DoesNotExist: + return Response( + {"detail": "Not found."}, + status=status.HTTP_404_NOT_FOUND + ) + serializer = GenreSerializer(genre) + return Response(serializer.data) - if request.method == "GET": - serializer = MovieSerializer(movie) - return Response(serializer.data, status=status.HTTP_200_OK) + def put(self, request, pk): + try: + genre = Genre.objects.get(pk=pk) + except Genre.DoesNotExist: + return Response( + {"detail": "Not found."}, + status=status.HTTP_404_NOT_FOUND + ) - if request.method == "PUT": - serializer = MovieSerializer(movie, data=request.data) + serializer = GenreSerializer(genre, data=request.data) if serializer.is_valid(): serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(serializer.data) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + def patch(self, request, pk): + genre = Genre.objects.get(pk=pk) + serializer = GenreSerializer(genre, data=request.data, partial=True) + if serializer.is_valid(): + serializer.save() + return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - if request.method == "DELETE": - movie.delete() + def delete(self, request, pk): + try: + genre = Genre.objects.get(pk=pk) + except Genre.DoesNotExist: + return Response( + {"detail": "Not found."}, + status=status.HTTP_404_NOT_FOUND + ) + + genre.delete() return Response(status=status.HTTP_204_NO_CONTENT) + + +class ActorList(GenericAPIView, ListModelMixin, 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( + GenericAPIView, + RetrieveModelMixin, + UpdateModelMixin, + DestroyModelMixin +): + 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( + GenericViewSet, + ListModelMixin, + CreateModelMixin, + RetrieveModelMixin, + UpdateModelMixin, + DestroyModelMixin +): + 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..39be1011d 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -9,7 +9,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/4.0/ref/settings/ """ - +import os +from dotenv import load_dotenv from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -20,14 +21,14 @@ # 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" -) +load_dotenv(dotenv_path=BASE_DIR / '.env') + +SECRET_KEY = os.environ.get('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['localhost', '127.0.0.1'] # Application definition diff --git a/requirements.txt b/requirements.txt index 99938e15f..766424827 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ flake8-variables-names==0.0.5 pep8-naming==0.13.2 django-debug-toolbar==3.2.4 djangorestframework==3.13.1 +python-dotenv==1.0.1