From fa9b0589148d7ec45feda42b5c7264a7b0ae7c3b Mon Sep 17 00:00:00 2001 From: iFixKart Dev Date: Tue, 17 Nov 2026 10:14:24 +0530 Subject: [PATCH] fix(catalog): ensure variant_image falls back to verified existing product images on disk --- app/api/v1/routers/CatalogRouter.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/app/api/v1/routers/CatalogRouter.py b/app/api/v1/routers/CatalogRouter.py index 0348576..91c48e2 100644 --- a/app/api/v1/routers/CatalogRouter.py +++ b/app/api/v1/routers/CatalogRouter.py @@ -981,19 +981,39 @@ def get_products( return " ".join(vals) def _variant_image(v, product) -> Optional[str]: - """Variant-specific image with product-level fallback.""" + """Variant-specific image with verified file existence and product-level fallback.""" if v.images: - return v.images[0].image_url + for vi in v.images: + if vi.image_url: + rel_path = vi.image_url.lstrip('/') + if not rel_path.startswith('uploads/') or os.path.exists(os.path.join(os.getcwd(), rel_path)): + return vi.image_url + if product.images: + for pi in product.images: + if pi.image_url: + rel_path = pi.image_url.lstrip('/') + if not rel_path.startswith('uploads/') or os.path.exists(os.path.join(os.getcwd(), rel_path)): + return pi.image_url banner_img = next((img.image_url for img in product.images if img.is_banner), product.images[0].image_url) return banner_img + + if v.images and v.images[0].image_url: + return v.images[0].image_url return None def _build_card(p, first_var, price, compare_price, discount_percent, stock_count) -> ProductCardResponse: thumbnail_url = None if p.images: - banner_img = next((img.image_url for img in p.images if img.is_banner), p.images[0].image_url) - thumbnail_url = banner_img + for pi in p.images: + if pi.image_url: + rel_path = pi.image_url.lstrip('/') + if not rel_path.startswith('uploads/') or os.path.exists(os.path.join(os.getcwd(), rel_path)): + thumbnail_url = pi.image_url + break + if not thumbnail_url: + banner_img = next((img.image_url for img in p.images if img.is_banner), p.images[0].image_url) + thumbnail_url = banner_img elif first_var and first_var.images: thumbnail_url = first_var.images[0].image_url