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

Solution #942

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# Generated by Django 4.0.2 on 2024-11-11 00:52

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

Choose a reason for hiding this comment

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

Redefining the User model can lead to conflicts with Django's built-in User model. Ensure that this is intentional and that the AUTH_USER_MODEL setting in your settings file points to this custom user model.

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)),

Choose a reason for hiding this comment

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

The Order model correctly uses settings.AUTH_USER_MODEL to reference the user model. Ensure that AUTH_USER_MODEL is set correctly in your Django settings to avoid any issues.

],
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=('row', 'seat', 'movie_session'), name='ticket_constraint'),
Comment on lines +91 to +93

Choose a reason for hiding this comment

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

The unique constraint on the Ticket model ensures that each ticket is unique for a given row, seat, and movie session. This is a good practice to prevent duplicate tickets.

),
]
77 changes: 76 additions & 1 deletion db/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
from django.contrib.auth.models import AbstractUser
from django.core.exceptions import ValidationError
from django.conf import settings
from django.db import models
from django.db.models import UniqueConstraint


class Genre(models.Model):
Expand All @@ -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")
Expand Down Expand Up @@ -50,3 +54,74 @@ 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 str(self.created_at)


class Ticket(models.Model):
row = models.IntegerField()
seat = models.IntegerField()

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"
)

class Meta:
constraints = [
UniqueConstraint(
fields=["row", "seat", "movie_session"],
name="ticket_constraint",
)
]

def clean(self) -> None:
cinema_hall = self.movie_session.cinema_hall
if self.row > cinema_hall.rows:
raise ValidationError(
{
"row": [
"row number must be in available range: "
f"(1, rows): (1, {cinema_hall.rows})"
]
}
)
if self.seat > cinema_hall.seats_in_row:
raise ValidationError(
{
"seat": [
"seat number must be in available range: "
f"(1, seats_in_row): (1, {cinema_hall.seats_in_row})"
]
}
)

def save(self, *args, **kwargs) -> None:
self.full_clean()
super().save(*args, **kwargs)

def __str__(self) -> str:
return f"{self.movie_session} (row: {self.row}, seat: {self.seat})"


class User(AbstractUser):
pass
Comment on lines +126 to +127

Choose a reason for hiding this comment

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

The User model is correctly defined as a subclass of AbstractUser. Ensure that the AUTH_USER_MODEL setting in your Django settings file is set to point to this custom user model to avoid any conflicts with Django's default user model.

9 changes: 8 additions & 1 deletion services/movie.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
from django.db import transaction
from django.db.models import QuerySet
from django.shortcuts import get_object_or_404

from db.models import Movie


def get_movies(
title: str = None,
genres_ids: list[int] = None,
actors_ids: list[int] = None,
) -> QuerySet:
queryset = Movie.objects.all()

if title:
queryset = queryset.filter(title__icontains=title)

if genres_ids:
queryset = queryset.filter(genres__id__in=genres_ids)

Expand All @@ -19,9 +25,10 @@ def get_movies(


def get_movie_by_id(movie_id: int) -> Movie:
return Movie.objects.get(id=movie_id)
return get_object_or_404(Movie, id=movie_id)


@transaction.atomic
def create_movie(
movie_title: str,
movie_description: str,
Expand Down
15 changes: 12 additions & 3 deletions services/movie_session.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.db.models import QuerySet
from django.shortcuts import get_object_or_404

from db.models import MovieSession
from db.models import MovieSession, Ticket


def create_movie_session(
Expand All @@ -21,7 +22,7 @@ def get_movies_sessions(session_date: str = None) -> QuerySet:


def get_movie_session_by_id(movie_session_id: int) -> MovieSession:
return MovieSession.objects.get(id=movie_session_id)
return get_object_or_404(MovieSession, id=movie_session_id)


def update_movie_session(
Expand All @@ -41,4 +42,12 @@ def update_movie_session(


def delete_movie_session_by_id(session_id: int) -> None:
MovieSession.objects.get(id=session_id).delete()
get_object_or_404(MovieSession, id=session_id).delete()


def get_taken_seats(movie_session_id: int) -> list[dict]:
return list(
Ticket.objects.filter(
movie_session_id=movie_session_id
).values("row", "seat")
)
48 changes: 48 additions & 0 deletions services/order.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import datetime

from django.contrib.auth import get_user_model
from django.db import transaction
from django.db.models import QuerySet
from django.shortcuts import get_object_or_404

from db.models import Order, Ticket, MovieSession


@transaction.atomic
def create_order(
tickets: list[dict],
username: str,
date: datetime = None

Choose a reason for hiding this comment

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

The date parameter in create_order should have a default value of None to avoid potential issues if no date is provided. Consider changing the parameter to date: datetime = None.

Choose a reason for hiding this comment

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

The date parameter should be of type datetime.datetime instead of datetime to avoid confusion and ensure proper handling of date and time.

) -> Order:
user = get_object_or_404(get_user_model(), username=username)

order = Order.objects.create(
user=user
)

if date:
order.created_at = date
order.save()

for ticket in tickets:
movie_session = get_object_or_404(
MovieSession,
id=ticket.get("movie_session")
)

Ticket.objects.create(
row=ticket.get("row"),
seat=ticket.get("seat"),
movie_session_id=movie_session.id,
order=order
)

return order


def get_orders(username: str = None) -> QuerySet[Order]:
if username:
return Order.objects.filter(
user=get_object_or_404(get_user_model(), username=username)
)
return Order.objects.all()
69 changes: 69 additions & 0 deletions services/user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
from django.contrib.auth import get_user_model
from django.core.exceptions import ValidationError
from django.shortcuts import get_object_or_404

from db.models import User


def create_user(
username: str,
password: str,
email: str = None,
first_name: str = None,
last_name: str = None
) -> User:
if get_user_model().objects.filter(username=username).exists():
raise ValidationError("Username already exists.")

if get_user_model().objects.filter(email=email).exists():
raise ValidationError("Email already exists.")

user = get_user_model().objects.create_user(
username=username,
password=password
)
Comment on lines +21 to +24

Choose a reason for hiding this comment

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

The create_user function should validate the uniqueness of the username and email before attempting to create the user. Consider checking for existing users with the same username or email to prevent integrity errors.


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 get_object_or_404(get_user_model(), 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)

Choose a reason for hiding this comment

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

The update_user function should handle the case where a user with the given ID does not exist. Consider using get_object_or_404 or handling the User.DoesNotExist exception to provide a more user-friendly error message.


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
4 changes: 4 additions & 0 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@
USE_TZ = False

Choose a reason for hiding this comment

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

The USE_TZ setting is set to False, which means Django will store naive datetime objects in the database. Consider setting USE_TZ = True to enable timezone support and avoid potential issues with datetime objects.

Choose a reason for hiding this comment

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

Consider setting USE_TZ = True to enable timezone support. This will help handle datetime objects correctly and avoid potential issues related to timezones.


INSTALLED_APPS = [
"django.contrib.auth",
"django.contrib.contenttypes",
"db",
]

AUTH_USER_MODEL = "db.User"
Loading