solution_py-tickets-and-orders_7

services/movie.py

@@ -28,20 +28,20 @@ def get_movie_by_id(movie_id: int) -> Movie:
  return Movie.objects.get(id=movie_id)
 
 
+@transaction.atomic
 def create_movie(
  movie_title: str,
  movie_description: str,
  genres_ids: list = None,
  actors_ids: list = None,
 ) -> 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
+ 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/order.py

@@ -1,6 +1,7 @@
 from django.db import transaction
-from db.models import Order, Ticket, User
+from db.models import Order, Ticket
 from django.db.models.query import QuerySet
+from django.contrib.auth import get_user_model
 
 
 @transaction.atomic()
@@ -10,9 +11,7 @@ def create_order(
  date: str = None
 ) -> None:
  order = Order.objects.create(
- user=User.objects.get(
- username=username
- )
+ user=get_user_model().objects.get(username=username)
  )
  if date:
  order.created_at = date
@@ -26,7 +25,7 @@ def create_order(
  )
 
 
-def get_orders(username: str = None) -> QuerySet:
+def get_orders(username: str = None) -> QuerySet(Order):
  orders = Order.objects.select_related("user")
  if username:
  orders = orders.filter(user__username=username)

services/user.py

@@ -1,4 +1,5 @@
 from db.models import User
+from django.contrib.auth import get_user_model
 
 
 def set_user_fields(
@@ -29,7 +30,10 @@ def create_user(
  first_name: str = None,
  last_name: str = None
 ) -> User:
- user = User.objects.create_user(username=username, password=password)
+ user = get_user_model().objects.create_user(
+ username=username,
+ password=password
+ )
  set_user_fields(
  user,
  email=email,
@@ -40,7 +44,7 @@ def create_user(
 
 
 def get_user(user_id: int) -> User:
- return User.objects.get(id=user_id)
+ return get_user_model().objects.get(id=user_id)
 
 
 def update_user(