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 #1 #377

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
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,94 @@
# Generated by Django 4.0.2 on 2023-07-06 15:27

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')),
],
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)),
],
options={
'ordering': ['-created_at'],
},
),
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()),
],
),
migrations.AddIndex(
model_name='movie',
index=models.Index(fields=['title'], name='db_movie_title_5d0841_idx'),
),
migrations.AddField(
model_name='ticket',
name='movie_session',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='db.moviesession'),
),
migrations.AddField(
model_name='ticket',
name='order',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='db.order'),
),
migrations.AddField(
model_name='order',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='user',
name='groups',
field=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'),
),
migrations.AddField(
model_name='user',
name='user_permissions',
field=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'),
),
migrations.AddConstraint(
model_name='ticket',
constraint=models.UniqueConstraint(fields=('row', 'seat', 'movie_session'), name='unique_ticket_row_seat_movie_session'),
),
]
77 changes: 77 additions & 0 deletions db/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
from django.db import models
from django.core.exceptions import ValidationError
from django.contrib.auth.models import AbstractUser

import settings


class Genre(models.Model):
Expand All @@ -22,6 +26,11 @@ class Movie(models.Model):
actors = models.ManyToManyField(to=Actor)
genres = models.ManyToManyField(to=Genre)

class Meta:
indexes = [
models.Index(fields=["title"])
]

def __str__(self) -> str:
return self.title

Expand All @@ -46,3 +55,71 @@ 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 str(self.created_at)


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

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

def clean(self) -> None:
if not self.row <= self.movie_session.cinema_hall.rows:

Choose a reason for hiding this comment

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

This check will be ok if you used PositiveIntegerField. You can receive self.row -3, for example, and it will be no error.

raise ValidationError(
{
"row": [
"row number must be in available range: (1, rows): "
f"(1, {self.movie_session.cinema_hall.rows})"
]
}
)

if not self.seat <= self.movie_session.cinema_hall.seats_in_row:

Choose a reason for hiding this comment

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

And the same here

raise ValidationError(
{
"seat": [
"seat number must be in available range: "
"(1, seats_in_row): "
f"(1, {self.movie_session.cinema_hall.seats_in_row})"
]
}
)

def save(
self,
force_insert: bool = False,
force_update: bool = False,
using: str = None,
update_fields: list[str] = None
) -> None:
self.full_clean()
return super().save(force_insert, force_update, using, update_fields)

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
24 changes: 16 additions & 8 deletions services/movie.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
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
) -> 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 @@ -28,13 +33,16 @@ 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)
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
7 changes: 6 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 Down Expand Up @@ -42,3 +42,8 @@ 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]:
return list(Ticket.objects.filter(
movie_session_id=movie_session_id).values("row", "seat"))
Copy link
Contributor

Choose a reason for hiding this comment

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

bad formmating here

37 changes: 37 additions & 0 deletions services/order.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
from django.contrib.auth import get_user_model
from db.models import Order, Ticket
from django.db import transaction
from django.db.models import QuerySet


def create_order(
tickets: list[dict],
username: str,
date: str = None) -> Order:
Copy link
Contributor

Choose a reason for hiding this comment

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

same

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

for ticket in tickets:
Ticket.objects.create(
movie_session_id=ticket["movie_session"],
order_id=order.id,
row=ticket["row"],
seat=ticket["seat"]
)
order.save()

Choose a reason for hiding this comment

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

You made save() in if check. If you don't change anything after creation no need to use save() more.

Choose a reason for hiding this comment

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

Maybe I explained not the best way. I meant you had already save() in if check, so you don't need additional one after the remaining part of your code. You need to make save() just in if check like below:
if date:
order.created_at = date
order.save()


return order


def get_orders(username: str = None) -> QuerySet[Order]:
order = Order.objects.all()

if username:
order = Order.objects.filter(user__username=username)

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


def create_user(
username: str,
password: str,
email: str = "",
first_name: str = "",
last_name: str = ""
) -> User:
return get_user_model().objects.create_user(
username=username,
password=password,
email=email,
first_name=first_name,
last_name=last_name
)

Choose a reason for hiding this comment

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

You need to create user with optional fields (email, first_name, last_name) just in that case if they were provided.



def get_user(user_id: int) -> User:
return get_user_model().objects.get(id=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_model().objects.get(id=user_id)

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

Choose a reason for hiding this comment

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

And make the same here. update_user(user_id: int, password: str, **kwargs)


user.save()
4 changes: 4 additions & 0 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,8 @@

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

AUTH_USER_MODEL = "db.User"