-
Notifications
You must be signed in to change notification settings - Fork 899
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 #950
base: master
Are you sure you want to change the base?
Solution #950
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 |
---|---|---|
@@ -0,0 +1,95 @@ | ||
# Generated by Django 4.0.2 on 2024-11-12 00:30 | ||
|
||
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()), | ||
], | ||
), | ||
Comment on lines
+19
to
+44
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. Creating a custom |
||
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)), | ||
Comment on lines
+49
to
+50
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
Comment on lines
+49
to
+50
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 |
||
], | ||
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, to='db.moviesession')), | ||
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='db.Order')), | ||
], | ||
), | ||
migrations.AddConstraint( | ||
model_name='ticket', | ||
constraint=models.UniqueConstraint(fields=('row', 'seat', 'movie_session'), name='unique_ticket'), | ||
Comment on lines
+91
to
+93
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 unique constraint on the |
||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Generated by Django 4.0.2 on 2024-11-12 01:55 | ||
|
||
from django.conf import settings | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('db', '0002_user_order_alter_movie_actors_alter_movie_genres_and_more'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='order', | ||
name='user', | ||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='orders', to=settings.AUTH_USER_MODEL), | ||
Comment on lines
+17
to
+18
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
Comment on lines
+17
to
+18
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 |
||
), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
from django.contrib.auth.models import AbstractUser | ||
from django.db import models | ||
from django.core.exceptions import ValidationError | ||
from django.db.models import UniqueConstraint | ||
from django.conf import settings | ||
|
||
|
||
class Genre(models.Model): | ||
|
@@ -17,7 +21,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 +54,65 @@ 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, | ||
null=True, | ||
blank=True, | ||
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. i think null and blank dont need here |
||
related_name="orders") | ||
|
||
def __str__(self) -> str: | ||
return str(self.created_at) | ||
|
||
class Meta: | ||
ordering = ("-created_at",) | ||
|
||
|
||
class Ticket(models.Model): | ||
movie_session = models.ForeignKey(to=MovieSession, | ||
on_delete=models.CASCADE) | ||
order = models.ForeignKey(to=Order, | ||
on_delete=models.CASCADE) | ||
row = models.IntegerField() | ||
seat = models.IntegerField() | ||
|
||
class Meta: | ||
constraints = [ | ||
UniqueConstraint( | ||
fields=["row", "seat", "movie_session"], | ||
name="unique_ticket" | ||
) | ||
] | ||
|
||
def __str__(self) -> str: | ||
return f"{self.movie_session} (row: {self.row}, seat: {self.seat})" | ||
|
||
def clean(self) -> None: | ||
if self.row < 1 or self.row > self.movie_session.cinema_hall.rows: | ||
raise ValidationError({ | ||
"row": [ | ||
f"row number must be in available range: (1, rows): (1, " | ||
f"{self.movie_session.cinema_hall.rows})" | ||
] | ||
}) | ||
|
||
if (self.seat < 1 | ||
or self.seat > self.movie_session.cinema_hall.seats_in_row): | ||
raise ValidationError({ | ||
"seat": [ | ||
f"seat number must be in " | ||
f"available range: (1, seats_in_row): (1, " | ||
f"{self.movie_session.cinema_hall.seats_in_row})" | ||
] | ||
}) | ||
Comment on lines
+93
to
+110
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 |
||
|
||
def save(self, *args, **kwargs) -> None: | ||
self.full_clean() | ||
super().save(*args, **kwargs) | ||
|
||
|
||
class User(AbstractUser): | ||
pass | ||
Comment on lines
+117
to
+118
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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
from django.db import transaction | ||
from django.db.models import QuerySet | ||
|
||
from db.models import Movie | ||
|
@@ -6,6 +7,7 @@ | |
def get_movies( | ||
genres_ids: list[int] = None, | ||
actors_ids: list[int] = None, | ||
Comment on lines
8
to
9
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 parameters |
||
title: str = None, | ||
) -> QuerySet: | ||
queryset = Movie.objects.all() | ||
|
||
|
@@ -15,6 +17,9 @@ def get_movies( | |
if actors_ids: | ||
queryset = queryset.filter(actors__id__in=actors_ids) | ||
|
||
if title: | ||
queryset = queryset.filter(title__icontains=title) | ||
|
||
return queryset | ||
|
||
|
||
|
@@ -28,13 +33,15 @@ def create_movie( | |
genres_ids: list = None, | ||
actors_ids: list = None, | ||
Comment on lines
33
to
34
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. Similar to the
Comment on lines
33
to
34
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 type annotations for |
||
) -> Movie: | ||
movie = Movie.objects.create( | ||
title=movie_title, | ||
description=movie_description, | ||
) | ||
if genres_ids: | ||
movie.genres.set(genres_ids) | ||
if actors_ids: | ||
movie.actors.set(actors_ids) | ||
|
||
with transaction.atomic(): | ||
movie = Movie.objects.create( | ||
title=movie_title, | ||
description=movie_description, | ||
) | ||
if genres_ids: | ||
movie.genres.set(genres_ids) | ||
if actors_ids: | ||
movie.actors.set(actors_ids) | ||
|
||
return movie |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
from django.db.models import QuerySet | ||
|
||
from db.models import MovieSession | ||
from db.models import MovieSession, Ticket | ||
|
||
|
||
def create_movie_session( | ||
|
@@ -41,4 +41,14 @@ def update_movie_session( | |
|
||
|
||
def delete_movie_session_by_id(session_id: int) -> None: | ||
MovieSession.objects.get(id=session_id).delete() | ||
try: | ||
MovieSession.objects.get(id=session_id).delete() | ||
except MovieSession.DoesNotExist: | ||
print(f"Movie session with id {session_id} does not exist.") | ||
|
||
|
||
def get_taken_seats(movie_session_id: int) -> list: | ||
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. There's a typo in the function name 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. Agree |
||
return [ | ||
{"row": ticket.row, "seat": ticket.seat} | ||
for ticket in Ticket.objects.filter(movie_session_id=movie_session_id) | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
from django.contrib.auth import get_user_model | ||
from django.core.exceptions import ObjectDoesNotExist | ||
from django.db import transaction | ||
from django.utils.datetime_safe import datetime | ||
|
||
from db.models import Order, Ticket, MovieSession | ||
|
||
|
||
def create_order(tickets: list, username: str, date: datetime = None) -> Order: | ||
|
||
with transaction.atomic(): | ||
try: | ||
user = get_user_model().objects.get(username=username) | ||
except ObjectDoesNotExist: | ||
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. Consider using 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. Agree |
||
raise ValueError( | ||
f"User with username '{username}' does not exist." | ||
) | ||
|
||
order = Order.objects.create(user=user) | ||
if date: | ||
order.created_at = date | ||
order.save() | ||
|
||
create_tickets = [ | ||
Ticket( | ||
row=ticket.get("row"), | ||
seat=ticket.get("seat"), | ||
movie_session=MovieSession.objects.get( | ||
id=ticket.get("movie_session") | ||
), | ||
order=order | ||
) | ||
for ticket in tickets | ||
] | ||
|
||
Ticket.objects.bulk_create(create_tickets) | ||
|
||
return order | ||
|
||
|
||
def get_orders(username: str = None) -> list: | ||
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 return type of 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. Agree |
||
if username: | ||
try: | ||
user = get_user_model().objects.get(username=username) | ||
except ObjectDoesNotExist: | ||
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. Consider using 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. Agree |
||
raise ValueError( | ||
f"User with username '{username}' does not exist." | ||
) | ||
return Order.objects.filter(user=user) | ||
else: | ||
return Order.objects.all() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
from django.contrib.auth import get_user_model | ||
from django.core.exceptions import ObjectDoesNotExist | ||
|
||
User = get_user_model() | ||
|
||
|
||
def create_user(username: str, | ||
password: str, | ||
email: str = None, | ||
first_name: str = None, | ||
last_name: str = None) -> User: | ||
first_name = first_name or "" | ||
last_name = last_name or "" | ||
user = User.objects.create_user( | ||
username=username, | ||
password=password, | ||
email=email, | ||
first_name=first_name, | ||
last_name=last_name | ||
) | ||
return user | ||
|
||
|
||
def get_user(user_id: int) -> User: | ||
try: | ||
return User.objects.get(pk=user_id) | ||
except ObjectDoesNotExist: | ||
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. Consider using 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. Agree |
||
raise ValueError(f"User with ID {user_id} does not exist.") | ||
|
||
|
||
def update_user(user_id: int, | ||
username: str = None, | ||
password: str = None, | ||
email: str = None, | ||
first_name: str = None, | ||
last_name: str = None) -> User: | ||
try: | ||
user = User.objects.get(pk=user_id) | ||
if username: | ||
Comment on lines
+38
to
+39
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. Use |
||
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 | ||
except ObjectDoesNotExist: | ||
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. Consider using 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. Agree |
||
raise ValueError(f"User with ID {user_id} not found. Update failed.") |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,4 +25,8 @@ | |
|
||
INSTALLED_APPS = [ | ||
"db", | ||
"django.contrib.auth", | ||
"django.contrib.contenttypes", | ||
Comment on lines
27
to
+29
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. db should be the last one in the list |
||
] | ||
|
||
AUTH_USER_MODEL = "db.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.
The
User
model is being created here, but it seems to duplicate the default DjangoUser
model. If you intend to extend the defaultUser
model, consider using a custom user model by extendingAbstractUser
orAbstractBaseUser
instead of creating a new model from scratch.