diff --git a/app/api/v1/routers/CatalogRouter.py b/app/api/v1/routers/CatalogRouter.py index b0c40c2..1c6c019 100644 --- a/app/api/v1/routers/CatalogRouter.py +++ b/app/api/v1/routers/CatalogRouter.py @@ -959,6 +959,23 @@ def get_products( page_variant_ids.extend([v.variant_id for v in (p.variants or [])]) stock_map = get_available_stock_map(page_variant_ids, db) + # Review statistics map for products on this page + ratings_map = {} + prod_ids = [p.product_id for p in products_list] + if prod_ids: + from app.models.ProductReviewModel import ProductReview + review_stats = db.execute( + select( + ProductReview.product_id, + func.avg(ProductReview.rating), + func.count(ProductReview.review_id) + ) + .where(ProductReview.product_id.in_(prod_ids), ProductReview.is_approved == True) + .group_by(ProductReview.product_id) + ).all() + for pid, avg_r, cnt in review_stats: + ratings_map[pid] = (round(float(avg_r), 1) if avg_r is not None else 5.0, int(cnt)) + # Map to lightweight DTO schema def _variant_label(v) -> str: """Build a human-readable variant label from its attributes (e.g. 'Moonlight Silver').""" @@ -1025,6 +1042,7 @@ def get_products( elif first_var and first_var.images and first_var.images[0].image_url: images_list = [{"image_url": first_var.images[0].image_url}] + prod_rating, prod_rev_count = ratings_map.get(p.product_id, (5.0, 0)) return ProductCardResponse( product_id=p.product_id, category_id=p.category_id, @@ -1035,7 +1053,8 @@ def get_products( price=price, compare_price=compare_price, discount_percent=discount_percent, - rating=p.rating if hasattr(p, "rating") and p.rating is not None else 4.8, + rating=prod_rating, + review_count=prod_rev_count, stock_count=stock_count, first_variant_id=first_var.variant_id if first_var else None, badge=p.badge if hasattr(p, "badge") else None, @@ -1144,6 +1163,17 @@ def get_product_detail_by_slug(slug: str, db: Session = Depends(get_db)): for r in reviews ] + valid_ratings = [float(r.rating) for r in reviews if r.rating is not None] + if valid_ratings: + avg_rating = round(sum(valid_ratings) / len(valid_ratings), 1) + total_reviews_count = len(valid_ratings) + else: + avg_rating = 5.0 + total_reviews_count = 0 + + product_serialized["rating"] = avg_rating + product_serialized["reviews_count"] = total_reviews_count + # Find related products prioritizing same brand and products with verified images on disk def _is_image_verified(p): if not p.images: @@ -1218,6 +1248,8 @@ def get_product_detail_by_slug(slug: str, db: Session = Depends(get_db)): response_payload = { "product": product_serialized, "reviews": reviews_serialized, + "average_rating": avg_rating, + "total_reviews": total_reviews_count, "related_products": related_serialized, "compatible_devices": compatibles, "specifications": [ diff --git a/app/schemas/Catalog.py b/app/schemas/Catalog.py index 16040e2..51031f3 100644 --- a/app/schemas/Catalog.py +++ b/app/schemas/Catalog.py @@ -617,6 +617,8 @@ class ProductResponse(BaseModel): variants: List[ProductVariantResponse] = [] locations: List[ProductLocationResponse] = [] thumbnail_url: Optional[str] = None + rating: Optional[float] = 5.0 + reviews_count: Optional[int] = 0 @model_validator(mode="after") def populate_images(self) -> 'ProductResponse': @@ -668,11 +670,11 @@ class ProductCardResponse(BaseModel): slug: str name: str thumbnail_url: Optional[str] = None - images: List[Dict[str, Any]] = [] price: Decimal compare_price: Optional[Decimal] = None discount_percent: int = 0 rating: float = 5.0 + review_count: int = 0 stock_count: int = 10 first_variant_id: Optional[str] = None badge: Optional[str] = None