-
Notifications
You must be signed in to change notification settings - Fork 858
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
Solution #870
base: master
Are you sure you want to change the base?
Solution #870
Changes from 2 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 |
---|---|---|
@@ -0,0 +1,95 @@ | ||
# Generated by Django 4.0.2 on 2024-09-01 21:37 | ||
|
||
from django.conf import settings | ||
import django.contrib.auth.models | ||
import django.contrib.auth.validators | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
import django.utils.timezone | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('auth', '0012_alter_user_first_name_max_length'), | ||
('db', '0001_initial'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='User', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('password', models.CharField(max_length=128, verbose_name='password')), | ||
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), | ||
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), | ||
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), | ||
('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), | ||
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), | ||
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), | ||
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), | ||
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), | ||
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), | ||
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), | ||
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), | ||
], | ||
options={ | ||
'verbose_name': 'user', | ||
'verbose_name_plural': 'users', | ||
'abstract': False, | ||
}, | ||
managers=[ | ||
('objects', django.contrib.auth.models.UserManager()), | ||
], | ||
), | ||
migrations.CreateModel( | ||
name='Order', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('created_at', models.DateTimeField(auto_now_add=True)), | ||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders', to=settings.AUTH_USER_MODEL)), | ||
], | ||
options={ | ||
'ordering': ('-created_at',), | ||
}, | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='actors', | ||
field=models.ManyToManyField(related_name='movies', to='db.Actor'), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(related_name='movies', to='db.Genre'), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='title', | ||
field=models.CharField(db_index=True, max_length=255), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='cinema_hall', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='db.cinemahall'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='movie', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='db.movie'), | ||
), | ||
migrations.CreateModel( | ||
name='Ticket', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('row', models.IntegerField()), | ||
('seat', models.IntegerField()), | ||
('movie_session', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to='db.moviesession')), | ||
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to='db.order')), | ||
], | ||
), | ||
migrations.AddConstraint( | ||
model_name='ticket', | ||
constraint=models.UniqueConstraint(fields=('movie_session', 'row', 'seat'), name='unique_ticket_constraint'), | ||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,11 @@ | ||
from django.conf import settings | ||
from django.db import models | ||
from django.core.exceptions import ValidationError | ||
from django.contrib.auth.models import AbstractUser | ||
|
||
|
||
class User(AbstractUser): | ||
pass | ||
|
||
|
||
class Genre(models.Model): | ||
|
@@ -17,7 +24,7 @@ def __str__(self) -> str: | |
|
||
|
||
class Movie(models.Model): | ||
title = models.CharField(max_length=255) | ||
title = models.CharField(max_length=255, db_index=True) | ||
description = models.TextField() | ||
actors = models.ManyToManyField(to=Actor, related_name="movies") | ||
genres = models.ManyToManyField(to=Genre, related_name="movies") | ||
|
@@ -50,3 +57,70 @@ class MovieSession(models.Model): | |
|
||
def __str__(self) -> str: | ||
return f"{self.movie.title} {str(self.show_time)}" | ||
|
||
|
||
class Order(models.Model): | ||
created_at = models.DateTimeField(auto_now_add=True) | ||
user = models.ForeignKey( | ||
settings.AUTH_USER_MODEL, | ||
on_delete=models.CASCADE, | ||
related_name="orders" | ||
) | ||
|
||
class Meta: | ||
ordering = ("-created_at",) | ||
|
||
def __str__(self) -> str: | ||
return f"{self.created_at}" | ||
|
||
|
||
class Ticket(models.Model): | ||
movie_session = models.ForeignKey( | ||
to=MovieSession, | ||
on_delete=models.CASCADE, | ||
related_name="tickets") | ||
order = models.ForeignKey( | ||
to=Order, | ||
on_delete=models.CASCADE, | ||
related_name="tickets") | ||
Comment on lines
+78
to
+85
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. the closing bracket should be on a separate line |
||
row = models.IntegerField() | ||
seat = models.IntegerField() | ||
|
||
class Meta: | ||
constraints = [ | ||
models.UniqueConstraint( | ||
fields=["movie_session", "row", "seat"], | ||
name="unique_ticket_constraint_movie_session_row_seat" | ||
) | ||
] | ||
ordering = ["movie_session", "row", "seat"] | ||
|
||
def __str__(self) -> str: | ||
return ( | ||
f"{self.movie_session.movie.title} {self.movie_session.show_time} " | ||
f"(row: {self.row}, seat: {self.seat})" | ||
) | ||
|
||
def clean(self) -> None: | ||
if self.row <= 0: | ||
raise ValidationError( | ||
{"row": "Row number must be greater than 0."} | ||
) | ||
if self.row > self.movie_session.cinema_hall.rows: | ||
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. you don't validate if numbers are below zero here 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 is possible to combine these two conditions above one Validation Error such as : |
||
raise ValidationError( | ||
{"row": "row number must be in available range: " | ||
"(1, rows): (1, 10)"} | ||
) | ||
if self.seat <= 0: | ||
raise ValidationError( | ||
{"seat": "Seat number must be greater than 0."} | ||
) | ||
if self.seat > self.movie_session.cinema_hall.seats_in_row: | ||
raise ValidationError( | ||
{"seat": "seat number must be in available range: " | ||
"(1, seats_in_row): (1, 12)"} | ||
) | ||
|
||
def save(self, *args, **kwargs) -> None: | ||
self.full_clean() | ||
super().save(*args, **kwargs) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,13 @@ | ||
from django.db.models import QuerySet | ||
from django.db import transaction | ||
|
||
from db.models import Movie | ||
|
||
|
||
def get_movies( | ||
genres_ids: list[int] = None, | ||
actors_ids: list[int] = None, | ||
title: str = None | ||
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. Annotation that this parameter can be None is missing |
||
) -> QuerySet: | ||
queryset = Movie.objects.all() | ||
|
||
|
@@ -15,13 +17,13 @@ def get_movies( | |
if actors_ids: | ||
queryset = queryset.filter(actors__id__in=actors_ids) | ||
|
||
return queryset | ||
|
||
if title: | ||
queryset = queryset.filter(title__icontains=title) | ||
|
||
def get_movie_by_id(movie_id: int) -> Movie: | ||
return Movie.objects.get(id=movie_id) | ||
return queryset | ||
|
||
|
||
@transaction.atomic | ||
def create_movie( | ||
movie_title: str, | ||
movie_description: str, | ||
|
@@ -38,3 +40,7 @@ def create_movie( | |
movie.actors.set(actors_ids) | ||
|
||
return movie | ||
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. You don't need return anything in create/update/delete functions, check everywhere |
||
|
||
|
||
def get_movie_by_id(movie_id: int) -> Movie: | ||
return Movie.objects.get(id=movie_id) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
from django.db.models import QuerySet | ||
|
||
from db.models import MovieSession | ||
from db.models import MovieSession, Ticket | ||
|
||
|
||
def create_movie_session( | ||
movie_show_time: str, movie_id: int, cinema_hall_id: int | ||
movie_show_time: str, | ||
movie_id: int, | ||
cinema_hall_id: int | ||
) -> MovieSession: | ||
return MovieSession.objects.create( | ||
show_time=movie_show_time, | ||
|
@@ -42,3 +44,13 @@ def update_movie_session( | |
|
||
def delete_movie_session_by_id(session_id: int) -> None: | ||
MovieSession.objects.get(id=session_id).delete() | ||
|
||
|
||
def get_taken_seats(movie_session_id: int) -> list[dict]: | ||
tickets = ( | ||
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. no need to store tickets in a variable that you will not reuse. just return result |
||
Ticket.objects.filter | ||
(movie_session_id=movie_session_id) | ||
.values("row", "seat") | ||
) | ||
|
||
return list(tickets) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
from django.db import transaction | ||
from django.db.models import QuerySet | ||
|
||
from db.models import Order, Ticket, User | ||
|
||
|
||
def create_order( | ||
tickets: list[dict], | ||
username: str, | ||
date: str = None | ||
) -> Order: | ||
user = User.objects.get(username=username) | ||
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. you should use 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. yeah, my mistake there is no need for transaction in read operation here 😊 |
||
|
||
with transaction.atomic(): | ||
order = Order.objects.create(user=user) | ||
if date: | ||
order.created_at = date | ||
order.save() | ||
|
||
for ticket_data in tickets: | ||
Ticket.objects.create( | ||
movie_session_id=ticket_data["movie_session"], | ||
order=order, | ||
row=ticket_data["row"], | ||
seat=ticket_data["seat"] | ||
) | ||
|
||
return order | ||
|
||
|
||
def get_orders(username: str | None = None) -> QuerySet: | ||
return ( | ||
Order.objects.filter(user__username=username) | ||
if username else Order.objects.all() | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
from django.contrib.auth import get_user_model | ||
|
||
|
||
User = get_user_model() | ||
|
||
|
||
def create_user( | ||
username: str, | ||
password: str, | ||
email: str | None = None, | ||
first_name: str | None = None, | ||
last_name: str | None = None | ||
) -> User: | ||
user = User.objects.create_user( | ||
username=username, | ||
password=password | ||
) | ||
|
||
if email: | ||
user.email = email | ||
if first_name: | ||
user.first_name = first_name | ||
if last_name: | ||
user.last_name = last_name | ||
|
||
user.save() | ||
|
||
return user | ||
|
||
|
||
def get_user(user_id: int) -> User: | ||
return User.objects.get(pk=user_id) | ||
|
||
|
||
def update_user( | ||
user_id: int, | ||
username: str = None, | ||
password: str = None, | ||
email: str = None, | ||
first_name: str = None, | ||
last_name: str = None | ||
) -> User: | ||
user = get_user(user_id) | ||
|
||
if any([username, password, email, first_name, last_name]): | ||
if username: | ||
user.username = username | ||
if password: | ||
user.set_password(password) | ||
if email: | ||
user.email = email | ||
if first_name: | ||
user.first_name = first_name | ||
if last_name: | ||
user.last_name = last_name | ||
|
||
user.save() | ||
|
||
return user |
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.
Meta class should be defined right after fields by django convention