Fixed mistakes

db/models.py

@@ -4,7 +4,7 @@
 from django.db import models
 from django.db.models import UniqueConstraint
 
-import settings
+from django.conf import settings
 
 
 class Genre(models.Model):

services/movie.py

@@ -5,9 +5,9 @@
 
 
 def get_movies(
- genres_ids: list[int] = None,
- actors_ids: list[int] = None,
- title: str = None,
+ genres_ids: list[int] | None = None,
+ actors_ids: list[int] | None = None,
+ title: str | None = None,
 ) -> QuerySet:
  queryset = Movie.objects.all()
 
@@ -30,8 +30,8 @@ def get_movie_by_id(movie_id: int) -> Movie:
 def create_movie(
  movie_title: str,
  movie_description: str,
- genres_ids: list = None,
- actors_ids: list = None,
+ genres_ids: list | None = None,
+ actors_ids: list | None = None,
 ) -> Movie:
  with transaction.atomic():
  movie = Movie.objects.create(

services/movie_session.py

@@ -13,7 +13,7 @@ def create_movie_session(
  )
 
 
-def get_movies_sessions(session_date: str = None) -> QuerySet:
+def get_movies_sessions(session_date: str | None = None) -> QuerySet:
  queryset = MovieSession.objects.all()
  if session_date:
  queryset = queryset.filter(show_time__date=session_date)
@@ -34,9 +34,9 @@ def get_taken_seats(movie_session_id: int) -> list[dict]:
 
 def update_movie_session(
  session_id: int,
- show_time: str = None,
- movie_id: int = None,
- cinema_hall_id: int = None,
+ show_time: str | None = None,
+ movie_id: int | None = None,
+ cinema_hall_id: int | None = None,
 ) -> None:
  movie_session = MovieSession.objects.get(id=session_id)
  if show_time:

services/order.py

@@ -5,7 +5,11 @@
 from db.models import Ticket, Order, MovieSession
 
 
-def create_order(tickets: list[dict], username: str, date: str = None) -> None:
+def create_order(
+ tickets: list[dict],
+ username: str,
+ date: str | None = None
+) -> None:
  with transaction.atomic():
  user = get_user_model().objects.get(username=username)
  order = Order.objects.create(user=user)
@@ -16,20 +20,18 @@ def create_order(tickets: list[dict], username: str, date: str = None) -> None:
 
  ticket_objects = []
  for ticket in tickets:
- movie_session = MovieSession.objects.get(
- pk=ticket["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
+ movie_session_id=ticket["movie_session"],
  ))
 
  Ticket.objects.bulk_create(ticket_objects)
 
 
-def get_orders(username: str = None) -> QuerySet:
+def get_orders(username: str | None = None) -> QuerySet[Order]:
  queryset = Order.objects.all()
 
  if username:

services/user.py

@@ -31,11 +31,11 @@ def get_user(user_id: int) -> User:
 
 def update_user(
  user_id: int,
- username: str = None,
- password: str = None,
- email: str = None,
- first_name: str = None,
- last_name: str = None
+ username: str | None = None,
+ password: str | None = None,
+ email: str | None = None,
+ first_name: str | None = None,
+ last_name: str | None = None
 ) -> None:
  user = get_user(user_id)