-
Notifications
You must be signed in to change notification settings - Fork 722
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
first #684
base: master
Are you sure you want to change the base?
first #684
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
from django.contrib import admin | ||
|
||
from cinema.models import Movie | ||
from cinema.models import Movie, Genre, Actor, CinemaHall | ||
|
||
|
||
@admin.register(Movie) | ||
class MovieAdmin(admin.ModelAdmin): | ||
pass | ||
admin.site.register(Movie) | ||
admin.site.register(Genre) | ||
admin.site.register(Actor) | ||
admin.site.register(CinemaHall) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Generated by Django 4.1 on 2024-09-28 08:28 | ||
|
||
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(to='cinema.actor'), | ||
), | ||
migrations.AddField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(to='cinema.genre'), | ||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# Generated by Django 4.1 on 2024-09-28 09:28 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('cinema', '0002_actor_cinemahall_genre_movie_actors_movie_genres'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='actor', | ||
name='first_name', | ||
field=models.CharField(max_length=30), | ||
), | ||
migrations.AlterField( | ||
model_name='actor', | ||
name='last_name', | ||
field=models.CharField(max_length=30), | ||
), | ||
migrations.AlterField( | ||
model_name='cinemahall', | ||
name='name', | ||
field=models.CharField(max_length=25), | ||
), | ||
migrations.AlterField( | ||
model_name='genre', | ||
name='name', | ||
field=models.CharField(max_length=30, unique=True), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='actors', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.actor'), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(related_name='movies', to='cinema.genre'), | ||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,33 @@ | ||
from django.db import models | ||
|
||
|
||
class Genre(models.Model): | ||
name = models.CharField(max_length=30, unique=True) | ||
|
||
def __str__(self): | ||
return self.name | ||
|
||
|
||
class Actor(models.Model): | ||
first_name = models.CharField(max_length=30) | ||
last_name = models.CharField(max_length=30) | ||
|
||
def __str__(self): | ||
return f"{self.first_name} {self.last_name}" | ||
|
||
|
||
class Movie(models.Model): | ||
title = models.CharField(max_length=255) | ||
description = models.TextField() | ||
duration = models.IntegerField() | ||
genres = models.ManyToManyField(Genre, related_name="movies") | ||
actors = models.ManyToManyField(Actor, related_name="movies") | ||
|
||
def __str__(self): | ||
return self.title | ||
|
||
|
||
class CinemaHall(models.Model): | ||
name = models.CharField(max_length=25) | ||
rows = models.IntegerField() | ||
seats_in_row = models.IntegerField() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
from rest_framework import serializers | ||
|
||
from cinema.models import Movie | ||
from cinema.models import Movie, CinemaHall, Genre, Actor | ||
|
||
|
||
class MovieSerializer(serializers.Serializer): | ||
|
@@ -9,15 +9,71 @@ class MovieSerializer(serializers.Serializer): | |
description = serializers.CharField() | ||
duration = serializers.IntegerField() | ||
|
||
def create(self, validated_data): | ||
def create(self, validated_data: dict) -> Movie: | ||
return Movie.objects.create(**validated_data) | ||
|
||
def update(self, instance, validated_data): | ||
def update(self, instance, validated_data: dict) -> Movie: | ||
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() | ||
|
||
return instance | ||
|
||
|
||
class CinemaHallSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
name = serializers.CharField(max_length=25) | ||
rows = serializers.IntegerField() | ||
seats_in_row = serializers.IntegerField() | ||
|
||
def create(self, validated_data: dict) -> CinemaHall: | ||
return CinemaHall.objects.create(**validated_data) | ||
|
||
def update(self, instance: CinemaHall, validated_data: dict) -> CinemaHall: | ||
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 GenreSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
name = serializers.CharField(max_length=25) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's recommended to maintain the same max_length for both models and serializers. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Having different max_length constraints in your Django model and serializer can lead to inconsistencies and potential issues. Fix it everywhere. |
||
|
||
def create(self, validated_data: dict) -> Genre: | ||
return Genre.objects.create(**validated_data) | ||
|
||
def update(self, instance: Genre, validated_data: dict) -> Genre: | ||
instance.name = validated_data.get("name", instance.name) | ||
|
||
instance.save() | ||
|
||
return instance | ||
|
||
|
||
class ActorSerializer(serializers.Serializer): | ||
id = serializers.IntegerField(read_only=True) | ||
first_name = serializers.CharField(max_length=63) | ||
last_name = serializers.CharField(max_length=63) | ||
|
||
def create(self, validated_data: dict) -> Actor: | ||
return Actor.objects.create(**validated_data) | ||
|
||
def update(self, instance: Actor, validated_data: dict) -> Actor: | ||
instance.first_name = validated_data.get( | ||
"first_name", instance.first_name | ||
) | ||
instance.last_name = validated_data.get( | ||
"last_name", instance.last_name | ||
) | ||
|
||
instance.save() | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,47 @@ | ||
from django.urls import path | ||
from django.urls import path, include | ||
|
||
from cinema.views import movie_list, movie_detail | ||
from rest_framework import routers | ||
|
||
from cinema.views import ( | ||
MovieViewSet, | ||
GenreList, | ||
GenreDetail, | ||
ActorList, | ||
ActorDetail, | ||
CinemaHallViewSet | ||
) | ||
|
||
cinema_hall_detail = CinemaHallViewSet.as_view( | ||
actions={ | ||
"get": "retrieve", | ||
"put": "update", | ||
"patch": "partial_update", | ||
"delete": "destroy" | ||
} | ||
) | ||
|
||
cinema_hall_list = CinemaHallViewSet.as_view( | ||
actions={ | ||
"get": "list", | ||
"post": "create" | ||
} | ||
) | ||
|
||
router = routers.DefaultRouter() | ||
router.register("movies", MovieViewSet) | ||
|
||
urlpatterns = [ | ||
path("movies/", movie_list, name="movie-list"), | ||
path("movies/<int:pk>/", movie_detail, name="movie-detail"), | ||
path("", include(router.urls)), | ||
path("genres/", GenreList.as_view(), name="genres-list"), | ||
path("genres/<int:pk>/", GenreDetail.as_view(), name="genre-detail"), | ||
path("actors/", ActorList.as_view(), name="actors"), | ||
path("actors/<int:pk>/", ActorDetail.as_view(), name="actor-detail"), | ||
path("cinema_halls/", cinema_hall_list, name="cinema-hall-list"), | ||
path( | ||
"cinema_halls/<int:pk>/", | ||
cinema_hall_detail, | ||
name="cinema-hall-detail" | ||
) | ||
] | ||
|
||
app_name = "cinema" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you don't include the id field, the API responses for actors will not show the id, and you won't be able to use it for updates or references in related models (like for associating an actor with a movie). This can be problematic if you're dealing with many-to-many relationships or need to update or delete specific actor records.
Add id field in every serializer