chore: minor fixes and formatting

dto/__init__.py

@@ -1,12 +1,12 @@
 from .cart import CartItemDTO
-from .control import EditProductContext
+from .catalogue import CatalogueType, CatalogueView
 from .checkout import CheckoutContext
-from .catalogue import CatalogueView, CatalogueType
+from .control import EditProductContext
 
 __all__ = [
     "CartItemDTO",
-    "EditProductContext",
-    "CheckoutContext",
-    "CatalogueView",
     "CatalogueType",
+    "CatalogueView",
+    "CheckoutContext",
+    "EditProductContext",
 ]

dto/cart.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 
 @dataclass(frozen=True)
@@ -18,4 +17,4 @@ class CartItemDTO:
 class CartDTO:
     items: list[CartItemDTO]
     total: int
-    order_id: Optional[int] = None
+    order_id: int | None = None

dto/catalogue.py

@@ -1,6 +1,5 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import Optional, Union
 
 from aiogram.types import Message
 
@@ -16,12 +15,12 @@ class CatalogueType(Enum):
 
 @dataclass
 class CatalogueView:
-    view_type: Optional[CatalogueType] = None
-    category: Optional[Category] = None
-    children: Optional[list[Category]] = None
-    products: Optional[list[Product]] = None
+    view_type: CatalogueType | None = None
+    category: Category | None = None
+    children: list[Category] | None = None
+    products: list[Product] | None = None
     page: int = 0
-    parent_id: Union[int, str, None] = None
+    parent_id: int | str | None = None
     has_next: bool = False
     show_menu: bool = False
 
@@ -29,7 +28,7 @@ class CatalogueView:
 @dataclass
 class NewCatalogueElement:
     msg: Message
-    parent_id: Union[int, str]
+    parent_id: int | str
 
 
 @dataclass

dto/checkout.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from aiogram.types import Message
 
@@ -8,6 +7,6 @@ from aiogram.types import Message
 class CheckoutContext:
     orig_msg: Message
     order_id: int
-    name: Optional[str] = None
-    phone: Optional[str] = None
-    address: Optional[str] = None
+    name: str | None = None
+    phone: str | None = None
+    address: str | None = None