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

Open
wants to merge 4 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
114 changes: 114 additions & 0 deletions db/migrations/0002_user_order_ticket_alter_movie_actors_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
# Generated by Django 4.0.2 on 2023-11-08 14:17

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.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='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.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, related_name='tickets', to='db.moviesession'),
),
migrations.AddField(
model_name='ticket',
name='order',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tickets', 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'),
),
]
83 changes: 83 additions & 0 deletions db/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
from django.core.exceptions import ValidationError
from django.db import models
from django.db.models import UniqueConstraint
from django.contrib.auth.models import AbstractUser


class User(AbstractUser):
pass


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

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

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

Expand Down Expand Up @@ -50,3 +62,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(to=User, on_delete=models.CASCADE)

Choose a reason for hiding this comment

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

you should refer to AUTH_USER_MODEL


class Meta:
ordering = ["-created_at"]
Comment on lines +75 to +76

Choose a reason for hiding this comment

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

class Meta should be placed before methods, don't forget to read checklist, please

Choose a reason for hiding this comment

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

fix everywhere


def __str__(self) -> str:
return str(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, related_name="tickets"
)
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.movie.title} "
f"{self.movie_session.show_time} "
f"(row: {self.row}, seat: {self.seat})")

def clean(self) -> None:
valid_seat = self.movie_session.cinema_hall.seats_in_row
valid_row = self.movie_session.cinema_hall.rows

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

}
)

if not (1 < self.row < valid_row):
raise ValidationError(
{
"row": [f"row number must be in available range: "
f"(1, rows): (1, {valid_row})"]
}
)

def save(
self,
force_insert: bool = False,
force_update: bool = False,
using: bool = None,
update_fields: bool = None
) -> "Ticket":
self.full_clean()
return super(Ticket, self).save(
force_insert,
force_update,
using,
update_fields
)
27 changes: 16 additions & 11 deletions services/movie.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
from django.db import transaction
from django.db.models import QuerySet

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 @@ -27,14 +32,14 @@ def create_movie(
movie_description: str,
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
) -> None:
with transaction.atomic():
movie = Movie(
title=movie_title,
description=movie_description,
)

if genres_ids:
movie.genres.set(genres_ids)
if actors_ids:
movie.actors.set(actors_ids)
8 changes: 8 additions & 0 deletions services/movie_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,11 @@ 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(
get_movie_session_by_id(movie_session_id).tickets.all().values(
"row", "seat"
)
)
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.db.models import QuerySet
from django.contrib.auth import get_user_model

from db.models import Ticket, Order, User
from django.db import transaction


def get_user(username: str) -> User:
return get_user_model().objects.get(username=username)


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

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

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


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

if username:
orders = orders.filter(user=get_user(username))

return orders.values("created_at")
57 changes: 57 additions & 0 deletions services/user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
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 = 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()


def get_user(user_id: int) -> User:
return User.objects.get(id=user_id)

Choose a reason for hiding this comment

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

use get_user_model() also here



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