marketplace refactoring
This commit is contained in:
@@ -16,7 +16,7 @@ from sqlalchemy import func
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.exceptions import ValidationException
|
||||
from models.database.product import Product
|
||||
from models.database.marketplace_product import MarketplaceProduct
|
||||
from models.database.stock import Stock
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -85,13 +85,13 @@ class StatsService:
|
||||
# Query to get stats per marketplace
|
||||
marketplace_stats = (
|
||||
db.query(
|
||||
Product.marketplace,
|
||||
func.count(Product.id).label("total_products"),
|
||||
func.count(func.distinct(Product.shop_name)).label("unique_shops"),
|
||||
func.count(func.distinct(Product.brand)).label("unique_brands"),
|
||||
MarketplaceProduct.marketplace,
|
||||
func.count(MarketplaceProduct.id).label("total_products"),
|
||||
func.count(func.distinct(MarketplaceProduct.shop_name)).label("unique_shops"),
|
||||
func.count(func.distinct(MarketplaceProduct.brand)).label("unique_brands"),
|
||||
)
|
||||
.filter(Product.marketplace.isnot(None))
|
||||
.group_by(Product.marketplace)
|
||||
.filter(MarketplaceProduct.marketplace.isnot(None))
|
||||
.group_by(MarketplaceProduct.marketplace)
|
||||
.all()
|
||||
)
|
||||
|
||||
@@ -195,13 +195,13 @@ class StatsService:
|
||||
# Private helper methods
|
||||
def _get_product_count(self, db: Session) -> int:
|
||||
"""Get total product count."""
|
||||
return db.query(Product).count()
|
||||
return db.query(MarketplaceProduct).count()
|
||||
|
||||
def _get_unique_brands_count(self, db: Session) -> int:
|
||||
"""Get count of unique brands."""
|
||||
return (
|
||||
db.query(Product.brand)
|
||||
.filter(Product.brand.isnot(None), Product.brand != "")
|
||||
db.query(MarketplaceProduct.brand)
|
||||
.filter(MarketplaceProduct.brand.isnot(None), MarketplaceProduct.brand != "")
|
||||
.distinct()
|
||||
.count()
|
||||
)
|
||||
@@ -209,10 +209,10 @@ class StatsService:
|
||||
def _get_unique_categories_count(self, db: Session) -> int:
|
||||
"""Get count of unique categories."""
|
||||
return (
|
||||
db.query(Product.google_product_category)
|
||||
db.query(MarketplaceProduct.google_product_category)
|
||||
.filter(
|
||||
Product.google_product_category.isnot(None),
|
||||
Product.google_product_category != "",
|
||||
MarketplaceProduct.google_product_category.isnot(None),
|
||||
MarketplaceProduct.google_product_category != "",
|
||||
)
|
||||
.distinct()
|
||||
.count()
|
||||
@@ -221,8 +221,8 @@ class StatsService:
|
||||
def _get_unique_marketplaces_count(self, db: Session) -> int:
|
||||
"""Get count of unique marketplaces."""
|
||||
return (
|
||||
db.query(Product.marketplace)
|
||||
.filter(Product.marketplace.isnot(None), Product.marketplace != "")
|
||||
db.query(MarketplaceProduct.marketplace)
|
||||
.filter(MarketplaceProduct.marketplace.isnot(None), MarketplaceProduct.marketplace != "")
|
||||
.distinct()
|
||||
.count()
|
||||
)
|
||||
@@ -230,8 +230,8 @@ class StatsService:
|
||||
def _get_unique_shops_count(self, db: Session) -> int:
|
||||
"""Get count of unique shops."""
|
||||
return (
|
||||
db.query(Product.shop_name)
|
||||
.filter(Product.shop_name.isnot(None), Product.shop_name != "")
|
||||
db.query(MarketplaceProduct.shop_name)
|
||||
.filter(MarketplaceProduct.shop_name.isnot(None), MarketplaceProduct.shop_name != "")
|
||||
.distinct()
|
||||
.count()
|
||||
)
|
||||
@@ -239,16 +239,16 @@ class StatsService:
|
||||
def _get_products_with_gtin_count(self, db: Session) -> int:
|
||||
"""Get count of products with GTIN."""
|
||||
return (
|
||||
db.query(Product)
|
||||
.filter(Product.gtin.isnot(None), Product.gtin != "")
|
||||
db.query(MarketplaceProduct)
|
||||
.filter(MarketplaceProduct.gtin.isnot(None), MarketplaceProduct.gtin != "")
|
||||
.count()
|
||||
)
|
||||
|
||||
def _get_products_with_images_count(self, db: Session) -> int:
|
||||
"""Get count of products with images."""
|
||||
return (
|
||||
db.query(Product)
|
||||
.filter(Product.image_link.isnot(None), Product.image_link != "")
|
||||
db.query(MarketplaceProduct)
|
||||
.filter(MarketplaceProduct.image_link.isnot(None), MarketplaceProduct.image_link != "")
|
||||
.count()
|
||||
)
|
||||
|
||||
@@ -265,11 +265,11 @@ class StatsService:
|
||||
def _get_brands_by_marketplace(self, db: Session, marketplace: str) -> List[str]:
|
||||
"""Get unique brands for a specific marketplace."""
|
||||
brands = (
|
||||
db.query(Product.brand)
|
||||
db.query(MarketplaceProduct.brand)
|
||||
.filter(
|
||||
Product.marketplace == marketplace,
|
||||
Product.brand.isnot(None),
|
||||
Product.brand != "",
|
||||
MarketplaceProduct.marketplace == marketplace,
|
||||
MarketplaceProduct.brand.isnot(None),
|
||||
MarketplaceProduct.brand != "",
|
||||
)
|
||||
.distinct()
|
||||
.all()
|
||||
@@ -279,11 +279,11 @@ class StatsService:
|
||||
def _get_shops_by_marketplace(self, db: Session, marketplace: str) -> List[str]:
|
||||
"""Get unique shops for a specific marketplace."""
|
||||
shops = (
|
||||
db.query(Product.shop_name)
|
||||
db.query(MarketplaceProduct.shop_name)
|
||||
.filter(
|
||||
Product.marketplace == marketplace,
|
||||
Product.shop_name.isnot(None),
|
||||
Product.shop_name != "",
|
||||
MarketplaceProduct.marketplace == marketplace,
|
||||
MarketplaceProduct.shop_name.isnot(None),
|
||||
MarketplaceProduct.shop_name != "",
|
||||
)
|
||||
.distinct()
|
||||
.all()
|
||||
@@ -292,7 +292,7 @@ class StatsService:
|
||||
|
||||
def _get_products_by_marketplace_count(self, db: Session, marketplace: str) -> int:
|
||||
"""Get product count for a specific marketplace."""
|
||||
return db.query(Product).filter(Product.marketplace == marketplace).count()
|
||||
return db.query(MarketplaceProduct).filter(MarketplaceProduct.marketplace == marketplace).count()
|
||||
|
||||
# Create service instance following the same pattern as other services
|
||||
stats_service = StatsService()
|
||||
|
||||
Reference in New Issue
Block a user