diff --git a/cinema/admin.py b/cinema/admin.py index 06a2c4616..3e1d1526b 100644 --- a/cinema/admin.py +++ b/cinema/admin.py @@ -1,8 +1,8 @@ from django.contrib import admin +from .models import Actor, Genre, CinemaHall, Movie -from cinema.models import Movie +admin.site.register(Actor) +admin.site.register(Genre) +admin.site.register(CinemaHall) +admin.site.register(Movie) - -@admin.register(Movie) -class MovieAdmin(admin.ModelAdmin): - pass diff --git a/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_duration_and_more.py b/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_duration_and_more.py new file mode 100644 index 000000000..e9aabb67e --- /dev/null +++ b/cinema/migrations/0002_actor_cinemahall_genre_alter_movie_duration_and_more.py @@ -0,0 +1,52 @@ +# Generated by Django 4.1 on 2024-10-17 16:15 + +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.AlterField( + model_name='movie', + name='duration', + field=models.DurationField(), + ), + 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..b9500f780 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() + duration = models.DurationField() + 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..c9f85f68d 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1,24 +1,26 @@ from rest_framework import serializers +from cinema.models import Actor, Genre, CinemaHall, Movie -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): + class Meta: + model = Movie + fields = ['id', 'title', 'description', 'duration', 'actors', 'genres'] diff --git a/cinema/urls.py b/cinema/urls.py index 1ae7d5cb0..79a582f7e 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,10 +1,16 @@ -from django.urls import path +from django.urls import path, include +from rest_framework.routers import DefaultRouter +from .views import GenreAPIView, ActorListCreateView, ActorDetailView, CinemaHallViewSet, MovieViewSet -from cinema.views import movie_list, movie_detail +app_name = 'cinema' # Set the app_name here + +router = DefaultRouter() +router.register(r'movies', MovieViewSet) +router.register(r'cinema_halls', CinemaHallViewSet) urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), + path('genres/', GenreAPIView.as_view(), name='genre-list'), + path('actors/', ActorListCreateView.as_view(), name='actor-list'), + path('actors//', ActorDetailView.as_view(), name='actor-detail'), + path('', include(router.urls)), ] - -app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 78ba8a79c..321e2646c 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,45 +1,41 @@ -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 cinema.models import Genre, Actor, CinemaHall, Movie +from cinema.serializers import GenreSerializer, ActorSerializer, CinemaHallSerializer, MovieSerializer +from rest_framework.generics import ListCreateAPIView, RetrieveUpdateDestroyAPIView +from rest_framework import viewsets -from django.shortcuts import get_object_or_404 -from cinema.models import Movie -from cinema.serializers import MovieSerializer +class GenreAPIView(APIView): + def get(self, request): + genres = Genre.objects.all() + serializer = GenreSerializer(genres, many=True) + return Response(serializer.data) - -@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) + 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 ActorListCreateView(ListCreateAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer - if request.method == "GET": - serializer = MovieSerializer(movie) - 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) +class ActorDetailView(RetrieveUpdateDestroyAPIView): + queryset = Actor.objects.all() + serializer_class = ActorSerializer + + +class CinemaHallViewSet(viewsets.ModelViewSet): + queryset = CinemaHall.objects.all() + serializer_class = CinemaHallSerializer - 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 MovieViewSet(viewsets.ModelViewSet): + queryset = Movie.objects.all() + serializer_class = MovieSerializer