develop

README.md

@@ -1,6 +1,6 @@
 # Tickets and orders
 
-Read [the guideline](https://github.com/mate-academy/py-task-guideline/blob/main/README.md) before starting.
+Read [git checkout -b develop guideline](https://github.com/mate-academy/py-task-guideline/blob/main/README.md) before starting.
 
 In `db/models.py` you already have tables you created earlier. Now
 you have to create or edit tables:

db/migrations/0001_initial.py

@@ -1,14 +1,19 @@
-# Generated by Django 4.0.2 on 2022-06-15 12:37
+# Generated by Django 5.1.1 on 2024-09-07 23:07
 
-from django.db import migrations, models
+import django.contrib.auth.models
+import django.contrib.auth.validators
 import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
  initial = True
 
  dependencies = [
+ ('auth', '0012_alter_user_first_name_max_length'),
  ]
 
  operations = [
@@ -36,23 +41,78 @@ class Migration(migrations.Migration):
  ('name', models.CharField(max_length=255, unique=True)),
  ],
  ),
+ 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='Movie',
  fields=[
  ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(max_length=255)),
+ ('title', models.CharField(db_index=True, max_length=255)),
  ('description', models.TextField()),
- ('actors', models.ManyToManyField(to='db.Actor')),
- ('genres', models.ManyToManyField(to='db.Genre')),
+ ('actors', models.ManyToManyField(related_name='movies', to='db.actor')),
+ ('genres', models.ManyToManyField(related_name='movies', to='db.genre')),
  ],
  ),
  migrations.CreateModel(
  name='MovieSession',
  fields=[
  ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  ('show_time', models.DateTimeField()),
- ('cinema_hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='db.cinemahall')),
- ('movie', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='db.movie')),
+ ('cinema_hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='db.cinemahall')),
+ ('movie', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='db.movie')),
+ ],
+ ),
+ 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.CreateModel(
+ name='Ticket',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('row', models.PositiveIntegerField()),
+ ('seat', models.PositiveIntegerField()),
+ ('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.AddIndex(
+ model_name='movie',
+ index=models.Index(fields=['title'], name='db_movie_title_5d0841_idx'),
+ ),
+ migrations.AddConstraint(
+ model_name='ticket',
+ constraint=models.UniqueConstraint(fields=('movie_session', 'row', 'seat'), name='unique_seat_in_session'),
+ ),
  ]

db/migrations/0002_remove_ticket_unique_seat_in_session_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.1 on 2024-09-07 23:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('db', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RemoveConstraint(
+ model_name='ticket',
+ name='unique_seat_in_session',
+ ),
+ migrations.AlterField(
+ model_name='ticket',
+ name='row',
+ field=models.IntegerField(),
+ ),
+ migrations.AlterField(
+ model_name='ticket',
+ name='seat',
+ field=models.IntegerField(),
+ ),
+ migrations.AddConstraint(
+ model_name='ticket',
+ constraint=models.UniqueConstraint(fields=('movie_session', 'order', 'row', 'seat'), name='unique_ticket'),
+ ),
+ ]

db/models.py

@@ -1,4 +1,6 @@
+from django.contrib.auth.models import AbstractUser
 from django.db import models
+from django.core.exceptions import ValidationError
 
 
 class Genre(models.Model):
@@ -17,14 +19,19 @@ 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")
 
  def __str__(self) -> str:
  return self.title
 
+ class Meta:
+ indexes = [
+ models.Index(fields=['title']),
+ ]
+
 
 class CinemaHall(models.Model):
  name = models.CharField(max_length=255)
@@ -42,11 +49,75 @@ def __str__(self) -> str:
 class MovieSession(models.Model):
  show_time = models.DateTimeField()
  cinema_hall = models.ForeignKey(
- to=CinemaHall, on_delete=models.CASCADE, related_name="movie_sessions"
+ to=CinemaHall, on_delete=models.CASCADE,
+ related_name="movie_sessions"
  )
  movie = models.ForeignKey(
- to=Movie, on_delete=models.CASCADE, related_name="movie_sessions"
+ to=Movie, on_delete=models.CASCADE,
+ related_name="movie_sessions"
  )
 
  def __str__(self) -> str:
  return f"{self.movie.title} {str(self.show_time)}"
+
+
+class User(AbstractUser):
+ pass
+
+
+class Order(models.Model):
+ created_at = models.DateTimeField(auto_now_add=True)
+ user = models.ForeignKey('User',
+ on_delete=models.CASCADE)
+
+ def __str__(self):
+ return str(self.created_at)
+
+ class Meta:
+ ordering = ['-created_at']
+
+
+# db/models.py
+
+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()
+
+ def __str__(self):
+ movie_title = self.movie_session.movie.title
+ show_time = self.movie_session.show_time.strftime(
+ '%Y-%m-%d %H:%M:%S')
+ return (f"{movie_title} {show_time}"
+ f" (row: {self.row}, seat: {self.seat})")
+
+ def clean(self):
+ movie_session = self.movie_session
+ if not (1 <= self.row <= movie_session.cinema_hall.rows):
+ raise ValidationError({
+ 'row': f'row number must be in available range:'
+ f' (1, rows): (1,'
+ f' {movie_session.cinema_hall.rows})'
+ })
+ if not (
+ 1 <= self.seat <= movie_session.cinema_hall.seats_in_row):
+ raise ValidationError({
+ 'seat': f'seat number must be in available range:'
+ f' (1, seats_in_row): (1,'
+ f' {movie_session.cinema_hall.seats_in_row})'
+ })
+
+ def save(self, *args, **kwargs):
+ self.full_clean()
+ super().save(*args, **kwargs)
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=['movie_session', 'order', 'row', 'seat'],
+ name='unique_ticket'
+ )
+ ]

pytest.ini

@@ -1,3 +1,4 @@
 [pytest]
 DJANGO_SETTINGS_MODULE = settings
-addopts = --reuse-db
+addopts = --reuse-db
+python_files = tests.py test_*.py *_tests.py

services/cinema_hall.py

@@ -1,5 +1,4 @@
 from django.db.models import QuerySet
-
 from db.models import CinemaHall
 
 

services/movie.py

@@ -1,40 +1,51 @@
 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,
-) -> QuerySet:
+def get_movies(genres_ids=None, actors_ids=None, title=None) -> QuerySet:
  queryset = Movie.objects.all()
 
  if genres_ids:
- queryset = queryset.filter(genres__id__in=genres_ids)
+ queryset = queryset.filter(genres__id__in=genres_ids).distinct()
 
  if actors_ids:
- queryset = queryset.filter(actors__id__in=actors_ids)
+ queryset = queryset.filter(actors__id__in=actors_ids).distinct()
+
+ if title:
+ queryset = queryset.filter(title__icontains=title)
 
  return queryset
 
 
 def get_movie_by_id(movie_id: int) -> Movie:
- return Movie.objects.get(id=movie_id)
+ 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
 
 
 def create_movie(
- movie_title: str,
- movie_description: str,
- genres_ids: list = None,
- actors_ids: list = None,
+  movie_title: str,
+  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
+ 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

services/movie_session.py

@@ -1,5 +1,5 @@
 from django.db.models import QuerySet
-
+from db.models import Ticket
 from db.models import MovieSession
 
 
@@ -13,11 +13,10 @@ def create_movie_session(
  )
 
 
-def get_movies_sessions(session_date: str = None) -> QuerySet:
+def get_movies_sessions(session_date: str = None) -> QuerySet[MovieSession]:
  queryset = MovieSession.objects.all()
  if session_date:
  queryset = queryset.filter(show_time__date=session_date)
- return queryset
 
 
 def get_movie_session_by_id(movie_session_id: int) -> MovieSession:
@@ -42,3 +41,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):
+ tickets = Ticket.objects.filter(movie_session_id=movie_session_id)
+ return [{"row": ticket.row, "seat": ticket.seat} for ticket in tickets]