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 #874

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 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-09-02 17:32

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, 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, 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_row_seat_movie_session_session'),
),
]
19 changes: 19 additions & 0 deletions db/migrations/0003_alter_ticket_movie_session.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 4.0.2 on 2024-09-02 19:10

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='ticket',
name='movie_session',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to='db.moviesession'),
),
]
79 changes: 78 additions & 1 deletion db/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

from django.contrib.auth.models import AbstractUser
from django.core.exceptions import ValidationError
from django.db import models
from django.db.models import UniqueConstraint

import settings
Copy link

Choose a reason for hiding this comment

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

it's better to use
from django.conf import settings
because you may want to have settings folder or another settings file



class Genre(models.Model):
Expand All @@ -17,7 +23,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 +56,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
)

class Meta:
ordering = ["-created_at"]

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


class Ticket(models.Model):
movie_session = models.ForeignKey(
MovieSession,
on_delete=models.CASCADE,
related_name="tickets"
)
order = models.ForeignKey(Order, on_delete=models.CASCADE)
row = models.IntegerField()
seat = models.IntegerField()

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

if not (1 <= self.seat <= self.movie_session.cinema_hall.seats_in_row):
raise ValidationError(
{
"seat": (
f"seat number must be in available range: "
f"(1, seats_in_row): "
f"(1, {self.movie_session.cinema_hall.seats_in_row})"
)
}
)

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

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

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


class User(AbstractUser):
pass
26 changes: 16 additions & 10 deletions services/movie.py
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
Expand All @@ -6,6 +7,7 @@
def get_movies(
genres_ids: list[int] = None,
actors_ids: list[int] = None,
title: str = None,
Copy link

Choose a reason for hiding this comment

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

str or None. Fix it everywhere

) -> QuerySet:
queryset = Movie.objects.all()

Expand 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


Expand All @@ -28,13 +33,14 @@ def create_movie(
genres_ids: list = None,
actors_ids: list = None,
) -> 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)

return movie
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

Choose a reason for hiding this comment

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

You don't need to return anything in create/update/delete functions, check everywhere

10 changes: 9 additions & 1 deletion services/movie_session.py
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(
Expand All @@ -24,6 +24,14 @@ def get_movie_session_by_id(movie_session_id: int) -> MovieSession:
return MovieSession.objects.get(id=movie_session_id)


def get_taken_seats(movie_session_id: int) -> list[dict]:
return list(
Ticket.objects
.filter(movie_session__id=movie_session_id)
.values("row", "seat")
)


def update_movie_session(
session_id: int,
show_time: str = None,
Expand Down
38 changes: 38 additions & 0 deletions services/order.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
from django.contrib.auth import get_user_model
from django.db import transaction
from django.db.models import QuerySet

from db.models import Ticket, Order, MovieSession


def create_order(tickets: list[dict], username: str, date: str = None) -> None:
with transaction.atomic():
user = get_user_model().objects.get(username=username)
order = Order.objects.create(user=user)

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

ticket_objects = []
for ticket in tickets:
movie_session = MovieSession.objects.get(
pk=ticket["movie_session"]
)
ticket_objects.append(Ticket(
order=order,
row=ticket["row"],
seat=ticket["seat"],
movie_session=movie_session
Copy link

Choose a reason for hiding this comment

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

let's set movie_session_id here

))

Ticket.objects.bulk_create(ticket_objects)


def get_orders(username: str = None) -> QuerySet:
Copy link

Choose a reason for hiding this comment

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

specify what kind of data this queryset contains. Fix everywhere

queryset = Order.objects.all()

if username:
queryset = queryset.filter(user__username=username)

return queryset
53 changes: 53 additions & 0 deletions services/user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
from django.contrib.auth import get_user_model

from db.models import User


def create_user(
username: str,
password: str,
email: str = None,
first_name: str = None,
last_name: str = None
) -> None:
user = get_user_model().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()


def get_user(user_id: int) -> User:
return get_user_model().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
) -> None:
user = get_user(user_id)

if username:
user.username = username
if email:
user.email = email
if first_name:
user.first_name = first_name
if last_name:
user.last_name = last_name
if password:
user.set_password(password)

user.save()
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

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

AUTH_USER_MODEL = "db.User"
Loading