chore: minor fixes and formatting

db/models/__init__.py

@@ -1,13 +1,13 @@
-from .orders import Order, OrderItem, OrderStatus
-from .products import Product, Category
 from .invoices import Invoice, InvoiceStatus
+from .orders import Order, OrderItem, OrderStatus
+from .products import Category, Product
 
 __all__ = [
+    "Category",
+    "Invoice",
+    "InvoiceStatus",
     "Order",
     "OrderItem",
     "OrderStatus",
     "Product",
-    "Category",
-    "Invoice",
-    "InvoiceStatus",
 ]

db/models/invoices.py

@@ -1,8 +1,9 @@
 from datetime import datetime
 from enum import Enum as E_cls
-from sqlalchemy import DateTime, func, Enum
-from sqlalchemy.orm import Mapped, mapped_column
+
+from sqlalchemy import DateTime, Enum, func
 from sqlalchemy.dialects.postgresql import BIGINT
+from sqlalchemy.orm import Mapped, mapped_column
 
 from db.base import Base
 

db/models/orders.py

@@ -1,8 +1,9 @@
 import enum
-from typing import List, Optional
-from sqlalchemy import ForeignKey, BigInteger
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from sqlalchemy import BigInteger, ForeignKey
 from sqlalchemy.dialects.postgresql import ENUM
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
 from db.base import Base
 from db.models.products import Product
 
@@ -19,10 +20,10 @@ class Order(Base):
     __tablename__ = "orders"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    customer: Mapped[Optional[int]] = mapped_column(BigInteger)
+    customer: Mapped[int | None] = mapped_column(BigInteger)
     status: Mapped[OrderStatus] = mapped_column(ENUM(OrderStatus, name="order_status"))
 
-    items: Mapped[List["OrderItem"]] = relationship("OrderItem", back_populates="order")
+    items: Mapped[list["OrderItem"]] = relationship("OrderItem", back_populates="order")
 
 
 class OrderItem(Base):

db/models/products.py

@@ -1,7 +1,6 @@
-from typing import Optional
-from sqlalchemy import ForeignKey, Text, Index
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import Boolean, ForeignKey, Index, Text
 from sqlalchemy.dialects.postgresql import TSVECTOR
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from db.base import Base
 
@@ -11,7 +10,7 @@ class Category(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(Text, nullable=False)
-    parent_id: Mapped[Optional[int]] = mapped_column(ForeignKey("categories.id"))
+    parent_id: Mapped[int | None] = mapped_column(ForeignKey("categories.id"))
 
     parent: Mapped["Category"] = relationship("Category", remote_side=[id])
 
@@ -20,15 +19,14 @@ class Product(Base):
     __tablename__ = "products"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    category_id: Mapped[Optional[int]] = mapped_column(ForeignKey("categories.id"))
+    category_id: Mapped[int | None] = mapped_column(ForeignKey("categories.id"))
     name: Mapped[str] = mapped_column(Text, nullable=False)
-    description: Mapped[Optional[str]] = mapped_column(Text)
+    description: Mapped[str | None] = mapped_column(Text)
     price: Mapped[int] = mapped_column()
     img_path: Mapped[str] = mapped_column(Text, nullable=True)
     file_id: Mapped[str] = mapped_column(Text, nullable=True, unique=True)
+    is_hidden: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
 
     search_vector: Mapped[str] = mapped_column(TSVECTOR)
 
-    __table_args__ = (
-        Index("idx_products_search", "search_vector", postgresql_using="gin"),
-    )
+    __table_args__ = (Index("idx_products_search", "search_vector", postgresql_using="gin"),)