product performance grouped kpi improvements

svc/queries/product_performance_sql.go

@@ -455,6 +455,7 @@ SalesAgg AS (
     FROM mk_product_performance_sales_daily
     WHERE sales_date >= DATE '2022-01-01'
       AND sales_date <= $1::date
+      AND upper(btrim(COALESCE(urun_ilk_grubu,''))) NOT IN ('MALZEMELI FASON', 'MALZEMESIZ FASON', 'DIGER')
     GROUP BY product_code, color_code, yaka_kodu, market_key
 ),
 Scope AS (
@@ -476,7 +477,7 @@ Scope AS (
         '' AS seri,
         '' AS yas_grubu,
         '' AS askili_yan,
-        '' AS urun_ilk_grubu,
+        COALESCE(pd.urun_ilk_grubu, '') AS urun_ilk_grubu,
         '' AS urun_ana_grubu,
         '' AS urun_alt_grubu,
         0 AS sales_qty_30d,
@@ -494,7 +495,9 @@ Scope AS (
         NULL::date AS last_sale_date,
         '' AS last_ref_number
     FROM LatestStock ls
+    LEFT JOIN mk_product_performance_price_dim pd ON pd.product_code=ls.product_code
     WHERE COALESCE(ls.stock_qty, 0) <> 0
+      AND upper(btrim(COALESCE(pd.urun_ilk_grubu,''))) NOT IN ('MALZEMELI FASON', 'MALZEMESIZ FASON', 'DIGER')
       AND NOT EXISTS (
           SELECT 1
           FROM SalesAgg sa
@@ -503,6 +506,20 @@ Scope AS (
             AND sa.yaka_kodu = ls.yaka_kodu
       )
 ),
+PriceDim AS (
+    SELECT
+        product_code,
+        CASE
+            WHEN cost_price_usd > 0 AND base_price_usd > 0 AND cost_price_usd < base_price_usd THEN base_price_usd
+            ELSE cost_price_usd
+        END AS cost_price_usd,
+        CASE
+            WHEN cost_price_usd > 0 AND base_price_usd > 0 AND cost_price_usd < base_price_usd THEN cost_price_usd
+            ELSE base_price_usd
+        END AS base_price_usd,
+        base_price_try
+    FROM mk_product_performance_price_dim
+),
 Base AS (
     SELECT
         s.*,
@@ -538,7 +555,8 @@ Base AS (
     LEFT JOIN Stock180Start s180 ON s180.product_code=s.product_code AND s180.color_code=s.color_code AND s180.yaka_kodu=s.yaka_kodu
     LEFT JOIN Stock365Start s365 ON s365.product_code=s.product_code AND s365.color_code=s.color_code AND s365.yaka_kodu=s.yaka_kodu
     LEFT JOIN StockTotalStart stotal ON stotal.product_code=s.product_code AND stotal.color_code=s.color_code AND stotal.yaka_kodu=s.yaka_kodu
-    LEFT JOIN mk_product_performance_price_dim pd ON pd.product_code=s.product_code
+    LEFT JOIN PriceDim pd ON pd.product_code=s.product_code
+    WHERE upper(btrim(COALESCE(NULLIF(s.urun_ilk_grubu,''), pd.urun_ilk_grubu, ''))) NOT IN ('MALZEMELI FASON', 'MALZEMESIZ FASON', 'DIGER')
 ),
 Spread AS (
     SELECT