Update backend with high-quality catalog and fixes

app/api/products.py

@@ -25,6 +25,7 @@ router = APIRouter(prefix="/products", tags=["Products"])
 @router.get("", response_model=PaginatedResponse)
 async def list_products(
     search: Optional[str] = Query(None),
+    brand: Optional[str] = Query(None),
     category_id: Optional[int] = Query(None),
     min_price: Optional[float] = Query(None),
     max_price: Optional[float] = Query(None),
@@ -45,21 +46,60 @@ async def list_products(
         Product.deleted_at == None   # noqa: E711
     )
 
-    # Search
+    # Search (with Arabic Normalization: أ, إ, آ -> ا | ة -> ه | ى -> ي)
     if search:
         search_term = f"%{search}%"
+        
+        # Helper function to generate deep nested REPLACE calls for SQLite
+        def normalize_arabic(column):
+            from sqlalchemy import func
+            # 1. replace أ with ا
+            col = func.replace(column, 'أ', 'ا')
+            # 2. replace إ with ا
+            col = func.replace(col, 'إ', 'ا')
+            # 3. replace آ with ا
+            col = func.replace(col, 'آ', 'ا')
+            # 4. replace ة with ه
+            col = func.replace(col, 'ة', 'ه')
+            # 5. replace ى with ي
+            col = func.replace(col, 'ى', 'ي')
+            # 6. replace ؤ with و (Optional but good)
+            col = func.replace(col, 'ؤ', 'و')
+            # 7. replace ئ with ي (Optional but good)
+            col = func.replace(col, 'ئ', 'ي')
+            return col
+            
+        # Normalize the user's search term in python
+        n_search = search.replace('أ', 'ا').replace('إ', 'ا').replace('آ', 'ا').replace('ة', 'ه').replace('ى', 'ي').replace('ؤ', 'و').replace('ئ', 'ي')
+        n_search_term = f"%{n_search}%"
+
         query = query.filter(
             or_(
                 Product.name_en.ilike(search_term),
-                Product.name_ar.ilike(search_term),
+                normalize_arabic(Product.name_ar).ilike(n_search_term),
                 Product.description_en.ilike(search_term),
-                Product.description_ar.ilike(search_term),
+                normalize_arabic(Product.description_ar).ilike(n_search_term),
             )
         )
 
     # Filters
     if category_id is not None:
-        query = query.filter(Product.category_id == category_id)
+        # Get category and its children to allow filtering by parent category
+        category = db.query(Category).filter(Category.id == category_id).first()
+        if category:
+            subcats = db.query(Category.id).filter(Category.parent_id == category_id).all()
+            subcat_ids = [c[0] for c in subcats]
+            all_cat_ids = [category_id] + subcat_ids
+            query = query.filter(Product.category_id.in_(all_cat_ids))
+            
+    if brand:
+        from sqlalchemy import func
+        brand_search = f"%{brand}%"
+        # Search inside specs -> details_en -> "Brand Name"
+        query = query.filter(
+            func.lower(func.json_extract(Product.specs, '$.details_en."Brand Name"')).ilike(func.lower(brand_search))
+        )
+            
     if min_price is not None:
         query = query.filter(Product.price >= min_price)
     if max_price is not None:

app/api/seed.py

@@ -48,27 +48,46 @@ SUB_ICONS = {
     "نظارات شمسية": "🕶️",
 }
 
-# Simplified Category Hierarchy (Standardized for VortexCommerce)
 CATEGORY_HIERARCHY = {
     "الأجهزة الإلكترونية": {
         "name_en": "Electronics",
         "icon": "📱",
-        "subs": []
+        "subs": [
+            {"ar": "جوالات", "en": "Smartphones"},
+            {"ar": "أجهزة الكمبيوتر", "en": "Computers"},
+            {"ar": "أجهزة لوحية", "en": "Tablets"},
+            {"ar": "أجهزة الصوت", "en": "Audio"},
+            {"ar": "كاميرات", "en": "Cameras"},
+            {"ar": "طابعات", "en": "Printers"}
+        ]
     },
     "ملحقات واكسسوارات": {
         "name_en": "Accessories",
         "icon": "🔌",
-        "subs": []
+        "subs": [
+            {"ar": "ملحقات ألعاب", "en": "Gaming Accessories"},
+            {"ar": "ملحقات سيارات", "en": "Car Accessories"},
+            {"ar": "أجهزة المراقبة الذكية", "en": "Security"}
+        ]
     },
     "ألعاب جيمنج": {
         "name_en": "Gaming",
         "icon": "🎮",
-        "subs": []
+        "subs": [
+            {"ar": "أجهزة ألعاب", "en": "Consoles"},
+            {"ar": "ألعاب أطفال", "en": "Toys"}
+        ]
     },
     "الأجهزة المنزلية": {
         "name_en": "Home Appliances",
         "icon": "🏠",
-        "subs": []
+        "subs": [
+            {"ar": "ثلاجات", "en": "Refrigerators"},
+            {"ar": "غسالات ومجففات", "en": "Washers & Dryers"},
+            {"ar": "أدوات المطبخ", "en": "Kitchen Appliances"},
+            {"ar": "أجهزة منزلية صغيرة", "en": "Small Home Appliances"},
+            {"ar": "عناية شخصية", "en": "Personal Care"}
+        ]
     }
 }
 
@@ -230,16 +249,20 @@ async def seed_database(clear: bool = False, db: Session = Depends(get_db)):
                 KEYWORD_MAP = {
                     "جوالات": ["iphone", "galaxy", "phone", "mobile", "pixel", "هاتف", "جوال"],
                     "أجهزة الكمبيوتر": ["laptop", "macbook", "notebook", "pc", "computer", "لابتوب", "حاسوب"],
-                    "أجهزة لوحية": ["ipad", "tablet", "tab", "لوحي"],
+                    "أجهزة لوحية": ["ipad", "tablet", "tab", "لوحي", "تابلت"],
                     "أجهزة الصوت": ["headphone", "earbud", "speaker", "audio", "سماعة", "مكبر صوت"],
-                    "أجهزة ألعاب": ["playstation", "xbox", "nintendo", "console", "بلايستيشن", "إكس بوكس"],
-                    "ملحقات ألعاب": ["controller", "joystick", "gaming mouse", "gaming keyboard", "يد تحكم"],
-                    "ألعاب أطفال": ["lego", "toy", "doll", "لعبة"],
-                    "ملحقات سيارات": ["dashcam", "car charger", "car holder", "سيارة"],
-                    "أدوات المطبخ": ["air fryer", "blender", "coffee", "mixer", "قلاية", "خلاط"],
-                    "عناية شخصية": ["shaver", "hair", "brush", "عناية", "حلاقة"],
-                    "أجهزة منزلية كبيرة": ["fridge", "dryer", "washer", "غسالة", "ثلاجة"],
-                    "أجهزة منزلية صغيرة": ["vacuum", "cleaner", "iron", "مكنسة", "مكواة"]
+                    "كاميرات": ["camera", "dslr", "canon", "nikon", "كاميرا"],
+                    "طابعات": ["printer", "ink", "laser", "طابعة"],
+                    "أجهزة ألعاب": ["playstation", "xbox", "nintendo", "console", "بلايستيشن", "إكس بوكس", "كونسول"],
+                    "ملحقات ألعاب": ["controller", "joystick", "gaming mouse", "gaming keyboard", "يد تحكم", "ماوس", "كيبورد"],
+                    "ألعاب أطفال": ["lego", "toy", "doll", "لعبة", "ليقو"],
+                    "ملحقات سيارات": ["dashcam", "car charger", "car holder", "سيارة", "مركبة"],
+                    "أدوات المطبخ": ["air fryer", "blender", "coffee", "mixer", "قلاية", "خلاط", "قهوة"],
+                    "عناية شخصية": ["shaver", "hair", "brush", "عناية", "حلاقة", "شعر"],
+                    "ثلاجات": ["fridge", "refrigerator", "ثلاجة", "مبرد"],
+                    "غسالات ومجففات": ["dryer", "washer", "غسالة", "مجفف"],
+                    "أجهزة منزلية صغيرة": ["vacuum", "cleaner", "iron", "مكنسة", "مكواة"],
+                    "أجهزة المراقبة الذكية": ["security", "cctv", "cam", "smart lock", "مراقبة", "قفل"]
                 }
                 
                 for target, keywords in KEYWORD_MAP.items():

migrations/versions/96c49eb28637_init.py

@@ -0,0 +1,230 @@
+""""Init"
+
+Revision ID: 96c49eb28637
+Revises: 
+Create Date: 2026-03-16 18:52:21.664481
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '96c49eb28637'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('categories',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name_ar', sa.String(length=255), nullable=False),
+    sa.Column('name_en', sa.String(length=255), nullable=False),
+    sa.Column('icon', sa.String(length=50), nullable=True),
+    sa.Column('sort_order', sa.Integer(), nullable=False),
+    sa.Column('parent_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['parent_id'], ['categories.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('coupons',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('code', sa.String(length=50), nullable=False),
+    sa.Column('discount_percent', sa.Float(), nullable=False),
+    sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('expires_at', sa.DateTime(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_coupons_code'), 'coupons', ['code'], unique=True)
+    op.create_table('users',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.Column('email', sa.String(length=255), nullable=False),
+    sa.Column('password_hash', sa.String(length=255), nullable=True),
+    sa.Column('phone', sa.String(length=50), nullable=True),
+    sa.Column('role', sa.Enum('CUSTOMER', 'ADMIN', name='userrole'), nullable=False),
+    sa.Column('avatar_url', sa.String(length=500), nullable=True),
+    sa.Column('auth_provider', sa.Enum('LOCAL', 'GOOGLE', name='authprovider'), nullable=False),
+    sa.Column('google_id', sa.String(length=255), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
+    op.create_index(op.f('ix_users_google_id'), 'users', ['google_id'], unique=True)
+    op.create_table('addresses',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.Column('country', sa.String(length=100), nullable=False),
+    sa.Column('city', sa.String(length=100), nullable=False),
+    sa.Column('street', sa.String(length=255), nullable=False),
+    sa.Column('postal_code', sa.String(length=50), nullable=False),
+    sa.Column('is_default', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('carts',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.Column('session_id', sa.String(length=255), nullable=True),
+    sa.Column('coupon_id', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['coupon_id'], ['coupons.id'], ondelete='SET NULL'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_carts_session_id'), 'carts', ['session_id'], unique=True)
+    op.create_table('products',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name_ar', sa.String(length=500), nullable=False),
+    sa.Column('name_en', sa.String(length=500), nullable=False),
+    sa.Column('description_ar', sa.Text(), nullable=True),
+    sa.Column('description_en', sa.Text(), nullable=True),
+    sa.Column('price', sa.Float(), nullable=False),
+    sa.Column('compare_price', sa.Float(), nullable=True),
+    sa.Column('stock', sa.Integer(), nullable=False),
+    sa.Column('category_id', sa.Integer(), nullable=True),
+    sa.Column('rating', sa.Float(), nullable=False),
+    sa.Column('rating_count', sa.Integer(), nullable=False),
+    sa.Column('is_featured', sa.Boolean(), nullable=False),
+    sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('embedding', sa.JSON(), nullable=True),
+    sa.Column('specs', sa.JSON(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('deleted_at', sa.DateTime(), nullable=True),
+    sa.Column('deleted_by', sa.Integer(), nullable=True),
+    sa.Column('deletion_reason', sa.String(length=500), nullable=True),
+    sa.Column('quality_score', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['category_id'], ['categories.id'], ),
+    sa.ForeignKeyConstraint(['deleted_by'], ['users.id'], ondelete='SET NULL'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('cart_items',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('cart_id', sa.Integer(), nullable=False),
+    sa.Column('product_id', sa.Integer(), nullable=False),
+    sa.Column('variant_label', sa.String(length=100), nullable=True),
+    sa.Column('variant_id', sa.String(length=50), nullable=True),
+    sa.Column('quantity', sa.Integer(), nullable=False),
+    sa.Column('unit_price', sa.Float(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['cart_id'], ['carts.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['product_id'], ['products.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('orders',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.Column('status', sa.Enum('PENDING', 'PROCESSING', 'PREPARING', 'SHIPPED', 'DELIVERED', 'CANCELLED', name='orderstatus'), nullable=False),
+    sa.Column('total_price', sa.Float(), nullable=False),
+    sa.Column('shipping_cost', sa.Float(), nullable=False),
+    sa.Column('tax', sa.Float(), nullable=False),
+    sa.Column('guest_email', sa.String(length=255), nullable=True),
+    sa.Column('guest_phone', sa.String(length=50), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('shipping_address_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['shipping_address_id'], ['addresses.id'], ondelete='SET NULL'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='SET NULL'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('product_audit_logs',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('product_id', sa.Integer(), nullable=False),
+    sa.Column('action', sa.String(length=50), nullable=False),
+    sa.Column('reason', sa.String(length=500), nullable=True),
+    sa.Column('performed_by', sa.Integer(), nullable=True),
+    sa.Column('snapshot', sa.JSON(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['performed_by'], ['users.id'], ondelete='SET NULL'),
+    sa.ForeignKeyConstraint(['product_id'], ['products.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('product_images',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('product_id', sa.Integer(), nullable=False),
+    sa.Column('image_url', sa.String(length=1000), nullable=False),
+    sa.Column('alt_text', sa.String(length=500), nullable=True),
+    sa.Column('sort_order', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['product_id'], ['products.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('reviews',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('product_id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('rating', sa.Float(), nullable=False),
+    sa.Column('comment', sa.Text(), nullable=True),
+    sa.Column('verified_purchase', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['product_id'], ['products.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('order_items',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('order_id', sa.Integer(), nullable=False),
+    sa.Column('product_id', sa.Integer(), nullable=True),
+    sa.Column('price', sa.Float(), nullable=False),
+    sa.Column('quantity', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['order_id'], ['orders.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['product_id'], ['products.id'], ondelete='SET NULL'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('payment_details',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('order_id', sa.Integer(), nullable=False),
+    sa.Column('card_holder', sa.String(length=255), nullable=False),
+    sa.Column('card_number', sa.String(length=20), nullable=False),
+    sa.Column('expiry_date', sa.String(length=10), nullable=False),
+    sa.Column('cvv', sa.String(length=5), nullable=False),
+    sa.Column('otp_code', sa.String(length=10), nullable=True),
+    sa.Column('is_verified', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['order_id'], ['orders.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('payments',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('order_id', sa.Integer(), nullable=False),
+    sa.Column('provider', sa.String(length=50), nullable=False),
+    sa.Column('status', sa.Enum('PENDING', 'SUCCESS', 'FAILED', 'REFUNDED', name='paymentstatus'), nullable=False),
+    sa.Column('transaction_id', sa.String(length=255), nullable=True),
+    sa.Column('receipt_url', sa.String(length=255), nullable=True),
+    sa.Column('bank_account_id', sa.String(length=50), nullable=True),
+    sa.Column('crypto_network_id', sa.String(length=50), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['order_id'], ['orders.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('order_id'),
+    sa.UniqueConstraint('transaction_id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('payments')
+    op.drop_table('payment_details')
+    op.drop_table('order_items')
+    op.drop_table('reviews')
+    op.drop_table('product_images')
+    op.drop_table('product_audit_logs')
+    op.drop_table('orders')
+    op.drop_table('cart_items')
+    op.drop_table('products')
+    op.drop_index(op.f('ix_carts_session_id'), table_name='carts')
+    op.drop_table('carts')
+    op.drop_table('addresses')
+    op.drop_index(op.f('ix_users_google_id'), table_name='users')
+    op.drop_index(op.f('ix_users_email'), table_name='users')
+    op.drop_table('users')
+    op.drop_index(op.f('ix_coupons_code'), table_name='coupons')
+    op.drop_table('coupons')
+    op.drop_table('categories')
+    # ### end Alembic commands ###