Skip to content
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

Develop #706

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 34 additions & 15 deletions cinema/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.0.2 on 2022-05-03 13:41
# Generated by Django 4.1 on 2024-10-20 20:17

from django.db import migrations, models

Expand All @@ -7,24 +7,43 @@ class Migration(migrations.Migration):

initial = True

dependencies = []
dependencies = [
]

operations = [
migrations.CreateModel(
name="Movie",
name='Actor',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('first_name', models.CharField(max_length=100)),
('last_name', models.CharField(max_length=100)),
],
),
migrations.CreateModel(
name='CinemaHall',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('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=100, unique=True)),
],
),
migrations.CreateModel(
name='Movie',
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("title", models.CharField(max_length=255)),
("description", models.TextField()),
("duration", models.IntegerField()),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255)),
('description', models.TextField()),
('duration', models.IntegerField()),
('actors', models.ManyToManyField(related_name='movies', to='cinema.actor')),
('genres', models.ManyToManyField(related_name='movies', to='cinema.genre')),
],
),
]
26 changes: 26 additions & 0 deletions cinema/models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
from django.db import models


class Genre(models.Model):
name = models.CharField(max_length=100, unique=True)

def __str__(self) -> str:
return self.name


class Actor(models.Model):
first_name = models.CharField(max_length=100)
last_name = models.CharField(max_length=100)

def __str__(self) -> str:
return f"{self.last_name} {self.first_name}"


class CinemaHall(models.Model):
name = models.CharField(max_length=100)
rows = models.IntegerField()
seats_in_row = models.IntegerField()

def __str__(self) -> str:
return f"{self.name} {self.rows} {self.seats_in_row}"


class Movie(models.Model):
title = models.CharField(max_length=255)
description = models.TextField()
actors = models.ManyToManyField(Actor, related_name="movies")
genres = models.ManyToManyField(Genre, related_name="movies")
duration = models.IntegerField()

def __str__(self):
Expand Down
42 changes: 39 additions & 3 deletions cinema/serializers.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,60 @@
from rest_framework import serializers

from cinema.models import Movie
from cinema.models import Movie, Actor, Genre, CinemaHall


class ActorSerializer(serializers.ModelSerializer):
class Meta:
model = Actor
fields = "__all__"


class GenreSerializer(serializers.ModelSerializer):
class Meta:
model = Genre
fields = "__all__"


class CinemaHallSerializer(serializers.ModelSerializer):
class Meta:
model = CinemaHall
fields = "__all__"


class MovieSerializer(serializers.Serializer):
id = serializers.IntegerField(read_only=True)
title = serializers.CharField(max_length=255)
description = serializers.CharField()
actors = serializers.PrimaryKeyRelatedField(
many=True,
queryset=Actor.objects.all()
)
genres = serializers.PrimaryKeyRelatedField(
many=True,
queryset=Genre.objects.all()
)
duration = serializers.IntegerField()

def create(self, validated_data):
return Movie.objects.create(**validated_data)
actors_data = validated_data.pop("actors")
genres_data = validated_data.pop("genres")
movie = Movie.objects.create(**validated_data)
movie.actors.set(actors_data)
movie.genres.set(genres_data)
return movie

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)

actors_data = validated_data.pop("actors", None)
genres_data = validated_data.pop("genres", None)
instance.save()

if actors_data is not None:
instance.actors.set(actors_data)
if genres_data is not None:
instance.genres.set(genres_data)
return instance
40 changes: 34 additions & 6 deletions cinema/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,38 @@
from django.urls import path
from django.urls import path, include

from cinema.views import movie_list, movie_detail
from rest_framework import routers

urlpatterns = [
path("movies/", movie_list, name="movie-list"),
path("movies/<int:pk>/", movie_detail, name="movie-detail"),
]
from cinema.views import (
MovieViewSet,
GenreList,
GenreDetail,
ActorList,
ActorDetail,
CinemaHallViewSet
)

app_name = "cinema"
router = routers.DefaultRouter()
router.register("movies", MovieViewSet, basename="movies")
router.register("cinema_halls", CinemaHallViewSet, basename="cinemahall")


urlpatterns = [
path("", include(router.urls)),
path("genres/", GenreList.as_view(), name="genre-list"),
path("genres/create/", GenreList.as_view(), name="genre-create"),
path("genres/<int:pk>/", GenreDetail.as_view(), name="genre-detail"),
path(
"genres/<int:pk>/update/",
GenreDetail.as_view(),
name="genre-update"
),
path(
"genres/<int:pk>/delete/",
GenreDetail.as_view(),
name="genre-delete"
),
path("actors/", ActorList.as_view(), name="actor-list"),
path("actors/", ActorList.as_view(), name="actor-list"),
path("actors/<int:pk>/", ActorDetail.as_view(), name="actor-detail"),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like there is a duplicate path for 'actors/'. You have two identical paths with the same name 'actor-list'. Consider removing one of them to avoid redundancy.

]
105 changes: 84 additions & 21 deletions cinema/views.py
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, viewsets, generics, mixins
from rest_framework.views import APIView

from django.shortcuts import get_object_or_404

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 MovieViewSet(viewsets.ModelViewSet):
queryset = Movie.objects.all()
serializer_class = MovieSerializer


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)
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_object(self, pk: int) -> Genre:
return get_object_or_404(Genre, pk=pk)

if request.method == "GET":
serializer = MovieSerializer(movie)
def get(self, request, pk: int) -> Response:
serializer = GenreSerializer(self.get_object(pk=pk))
return Response(serializer.data, status=status.HTTP_200_OK)

if request.method == "PUT":
serializer = MovieSerializer(movie, data=request.data)
def put(self, request, pk: int) -> Response:
serializer = GenreSerializer(self.get_object(pk=pk), data=request.data)
if serializer.is_valid():
serializer.save()
return Response(serializer.data, status=status.HTTP_200_OK)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

def patch(self, request, pk: int) -> Response:
serializer = GenreSerializer(self.get_object(pk=pk), data=request.data)
if serializer.is_valid():
serializer.save()
return Response(serializer.data, status=status.HTTP_200_OK)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

if request.method == "DELETE":
movie.delete()
def delete(self, request, pk: int) -> Response:
self.get_object(pk=pk).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, *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(
viewsets.GenericViewSet,
mixins.ListModelMixin,
mixins.CreateModelMixin,
mixins.RetrieveModelMixin,
mixins.UpdateModelMixin,
mixins.DestroyModelMixin,
):
queryset = CinemaHall.objects.all()
serializer_class = CinemaHallSerializer
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[pytest]
DJANGO_SETTINGS_MODULE = settings
DJANGO_SETTINGS_MODULE = cinema_service.settings
addopts = --reuse-db
Loading