refactor: migrate products and vendor_products to module auto-discovery
- Move admin/products.py to marketplace module as admin_products.py (marketplace product catalog browsing) - Move admin/vendor_products.py to catalog module as admin.py (vendor catalog management) - Move vendor/products.py to catalog module as vendor.py (vendor's own product catalog) - Update marketplace admin router to include products routes - Update catalog module routes/api/__init__.py with lazy imports - Remove legacy imports from admin and vendor API init files All product routes now auto-discovered via module system. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2,43 +2,33 @@
|
||||
"""
|
||||
Marketplace module admin routes.
|
||||
|
||||
This module wraps the existing admin marketplace routes and adds
|
||||
module-based access control. Routes are re-exported from the
|
||||
original location with the module access dependency.
|
||||
This module aggregates all marketplace admin routers into a single router
|
||||
for auto-discovery. Routes are defined in dedicated files with module-based
|
||||
access control.
|
||||
|
||||
Includes:
|
||||
- /marketplace/* - Marketplace monitoring
|
||||
- /products/* - Marketplace product catalog browsing
|
||||
- /marketplace-import-jobs/* - Marketplace import job monitoring
|
||||
- /letzshop/* - Letzshop integration
|
||||
"""
|
||||
|
||||
import importlib
|
||||
from fastapi import APIRouter
|
||||
|
||||
from fastapi import APIRouter, Depends
|
||||
from .admin_products import admin_products_router
|
||||
from .admin_marketplace import admin_marketplace_router
|
||||
from .admin_letzshop import admin_letzshop_router
|
||||
|
||||
from app.api.deps import require_module_access
|
||||
# Create aggregate router for auto-discovery
|
||||
# The router is named 'admin_router' for auto-discovery compatibility
|
||||
admin_router = APIRouter()
|
||||
|
||||
# Import original routers using importlib to avoid circular imports
|
||||
# (direct import triggers app.api.v1.admin.__init__.py which imports us)
|
||||
_marketplace_module = importlib.import_module("app.api.v1.admin.marketplace")
|
||||
_letzshop_module = importlib.import_module("app.api.v1.admin.letzshop")
|
||||
marketplace_original_router = _marketplace_module.router
|
||||
letzshop_original_router = _letzshop_module.router
|
||||
# Include marketplace product catalog routes
|
||||
admin_router.include_router(admin_products_router)
|
||||
|
||||
# Create module-aware router for marketplace
|
||||
admin_router = APIRouter(
|
||||
prefix="/marketplace",
|
||||
dependencies=[Depends(require_module_access("marketplace"))],
|
||||
)
|
||||
# Include marketplace import jobs routes
|
||||
admin_router.include_router(admin_marketplace_router)
|
||||
|
||||
# Re-export all routes from the original marketplace module
|
||||
for route in marketplace_original_router.routes:
|
||||
admin_router.routes.append(route)
|
||||
# Include letzshop routes
|
||||
admin_router.include_router(admin_letzshop_router)
|
||||
|
||||
# Create separate router for letzshop integration
|
||||
admin_letzshop_router = APIRouter(
|
||||
prefix="/letzshop",
|
||||
dependencies=[Depends(require_module_access("marketplace"))],
|
||||
)
|
||||
|
||||
for route in letzshop_original_router.routes:
|
||||
admin_letzshop_router.routes.append(route)
|
||||
__all__ = ["admin_router"]
|
||||
|
||||
265
app/modules/marketplace/routes/api/admin_products.py
Normal file
265
app/modules/marketplace/routes/api/admin_products.py
Normal file
@@ -0,0 +1,265 @@
|
||||
# app/modules/marketplace/routes/api/admin_products.py
|
||||
"""
|
||||
Admin marketplace product catalog endpoints.
|
||||
|
||||
Provides platform-wide product search and management capabilities:
|
||||
- Browse all marketplace products across vendors
|
||||
- Search by title, GTIN, SKU, brand
|
||||
- Filter by marketplace, vendor, availability, product type
|
||||
- View product details and translations
|
||||
- Copy products to vendor catalogs
|
||||
|
||||
All routes require module access control for the 'marketplace' module.
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_admin_api, require_module_access
|
||||
from app.core.database import get_db
|
||||
from app.modules.marketplace.services.marketplace_product_service import marketplace_product_service
|
||||
from models.schema.auth import UserContext
|
||||
|
||||
admin_products_router = APIRouter(
|
||||
prefix="/products",
|
||||
dependencies=[Depends(require_module_access("marketplace"))],
|
||||
)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Pydantic Models
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class AdminProductListItem(BaseModel):
|
||||
"""Product item for admin list view."""
|
||||
|
||||
id: int
|
||||
marketplace_product_id: str
|
||||
title: str | None = None
|
||||
brand: str | None = None
|
||||
gtin: str | None = None
|
||||
sku: str | None = None
|
||||
marketplace: str | None = None
|
||||
vendor_name: str | None = None
|
||||
price_numeric: float | None = None
|
||||
currency: str | None = None
|
||||
availability: str | None = None
|
||||
image_link: str | None = None
|
||||
is_active: bool | None = None
|
||||
is_digital: bool | None = None
|
||||
product_type_enum: str | None = None
|
||||
created_at: str | None = None
|
||||
updated_at: str | None = None
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class AdminProductListResponse(BaseModel):
|
||||
"""Paginated product list response for admin."""
|
||||
|
||||
products: list[AdminProductListItem]
|
||||
total: int
|
||||
skip: int
|
||||
limit: int
|
||||
|
||||
|
||||
class AdminProductStats(BaseModel):
|
||||
"""Product statistics for admin dashboard."""
|
||||
|
||||
total: int
|
||||
active: int
|
||||
inactive: int
|
||||
digital: int
|
||||
physical: int
|
||||
by_marketplace: dict[str, int]
|
||||
|
||||
|
||||
class MarketplacesResponse(BaseModel):
|
||||
"""Response for marketplaces list."""
|
||||
|
||||
marketplaces: list[str]
|
||||
|
||||
|
||||
class VendorsResponse(BaseModel):
|
||||
"""Response for vendors list."""
|
||||
|
||||
vendors: list[str]
|
||||
|
||||
|
||||
class CopyToVendorRequest(BaseModel):
|
||||
"""Request body for copying products to vendor catalog."""
|
||||
|
||||
marketplace_product_ids: list[int]
|
||||
vendor_id: int
|
||||
skip_existing: bool = True
|
||||
|
||||
|
||||
class CopyToVendorResponse(BaseModel):
|
||||
"""Response from copy to vendor operation."""
|
||||
|
||||
copied: int
|
||||
skipped: int
|
||||
failed: int
|
||||
auto_matched: int = 0
|
||||
limit_reached: bool = False
|
||||
details: list[dict] | None = None
|
||||
|
||||
|
||||
class AdminProductDetail(BaseModel):
|
||||
"""Detailed product information for admin view."""
|
||||
|
||||
id: int
|
||||
marketplace_product_id: str | None = None
|
||||
gtin: str | None = None
|
||||
mpn: str | None = None
|
||||
sku: str | None = None
|
||||
brand: str | None = None
|
||||
marketplace: str | None = None
|
||||
vendor_name: str | None = None
|
||||
source_url: str | None = None
|
||||
price: str | None = None
|
||||
price_numeric: float | None = None
|
||||
sale_price: str | None = None
|
||||
sale_price_numeric: float | None = None
|
||||
currency: str | None = None
|
||||
availability: str | None = None
|
||||
condition: str | None = None
|
||||
image_link: str | None = None
|
||||
additional_images: list | None = None
|
||||
is_active: bool | None = None
|
||||
is_digital: bool | None = None
|
||||
product_type_enum: str | None = None
|
||||
platform: str | None = None
|
||||
google_product_category: str | None = None
|
||||
category_path: str | None = None
|
||||
color: str | None = None
|
||||
size: str | None = None
|
||||
weight: float | None = None
|
||||
weight_unit: str | None = None
|
||||
translations: dict | None = None
|
||||
created_at: str | None = None
|
||||
updated_at: str | None = None
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Endpoints
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@admin_products_router.get("", response_model=AdminProductListResponse)
|
||||
def get_products(
|
||||
skip: int = Query(0, ge=0),
|
||||
limit: int = Query(50, ge=1, le=500),
|
||||
search: str | None = Query(
|
||||
None, description="Search by title, GTIN, SKU, or brand"
|
||||
),
|
||||
marketplace: str | None = Query(None, description="Filter by marketplace"),
|
||||
vendor_name: str | None = Query(None, description="Filter by vendor name"),
|
||||
availability: str | None = Query(None, description="Filter by availability"),
|
||||
is_active: bool | None = Query(None, description="Filter by active status"),
|
||||
is_digital: bool | None = Query(None, description="Filter by digital products"),
|
||||
language: str = Query("en", description="Language for title lookup"),
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: UserContext = Depends(get_current_admin_api),
|
||||
):
|
||||
"""
|
||||
Get all marketplace products with search and filtering.
|
||||
|
||||
This endpoint allows admins to browse the entire product catalog
|
||||
imported from various marketplaces.
|
||||
"""
|
||||
products, total = marketplace_product_service.get_admin_products(
|
||||
db=db,
|
||||
skip=skip,
|
||||
limit=limit,
|
||||
search=search,
|
||||
marketplace=marketplace,
|
||||
vendor_name=vendor_name,
|
||||
availability=availability,
|
||||
is_active=is_active,
|
||||
is_digital=is_digital,
|
||||
language=language,
|
||||
)
|
||||
|
||||
return AdminProductListResponse(
|
||||
products=[AdminProductListItem(**p) for p in products],
|
||||
total=total,
|
||||
skip=skip,
|
||||
limit=limit,
|
||||
)
|
||||
|
||||
|
||||
@admin_products_router.get("/stats", response_model=AdminProductStats)
|
||||
def get_product_stats(
|
||||
marketplace: str | None = Query(None, description="Filter by marketplace"),
|
||||
vendor_name: str | None = Query(None, description="Filter by vendor name"),
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: UserContext = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get product statistics for admin dashboard."""
|
||||
stats = marketplace_product_service.get_admin_product_stats(
|
||||
db, marketplace=marketplace, vendor_name=vendor_name
|
||||
)
|
||||
return AdminProductStats(**stats)
|
||||
|
||||
|
||||
@admin_products_router.get("/marketplaces", response_model=MarketplacesResponse)
|
||||
def get_marketplaces(
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: UserContext = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get list of unique marketplaces in the product catalog."""
|
||||
marketplaces = marketplace_product_service.get_marketplaces_list(db)
|
||||
return MarketplacesResponse(marketplaces=marketplaces)
|
||||
|
||||
|
||||
@admin_products_router.get("/vendors", response_model=VendorsResponse)
|
||||
def get_product_vendors(
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: UserContext = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get list of unique vendor names in the product catalog."""
|
||||
vendors = marketplace_product_service.get_source_vendors_list(db)
|
||||
return VendorsResponse(vendors=vendors)
|
||||
|
||||
|
||||
@admin_products_router.post("/copy-to-vendor", response_model=CopyToVendorResponse)
|
||||
def copy_products_to_vendor(
|
||||
request: CopyToVendorRequest,
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: UserContext = Depends(get_current_admin_api),
|
||||
):
|
||||
"""
|
||||
Copy marketplace products to a vendor's catalog.
|
||||
|
||||
This endpoint allows admins to copy products from the master marketplace
|
||||
product repository to any vendor's product catalog.
|
||||
|
||||
The copy creates a new Product entry linked to the MarketplaceProduct,
|
||||
with default values that can be overridden by the vendor later.
|
||||
"""
|
||||
result = marketplace_product_service.copy_to_vendor_catalog(
|
||||
db=db,
|
||||
marketplace_product_ids=request.marketplace_product_ids,
|
||||
vendor_id=request.vendor_id,
|
||||
skip_existing=request.skip_existing,
|
||||
)
|
||||
db.commit()
|
||||
return CopyToVendorResponse(**result)
|
||||
|
||||
|
||||
@admin_products_router.get("/{product_id}", response_model=AdminProductDetail)
|
||||
def get_product_detail(
|
||||
product_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: UserContext = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get detailed product information including all translations."""
|
||||
product = marketplace_product_service.get_admin_product_detail(db, product_id)
|
||||
return AdminProductDetail(**product)
|
||||
Reference in New Issue
Block a user