From 8302d796e0b6ed6fc75cbbd0d603b74ea4c95477 Mon Sep 17 00:00:00 2001
From: "Bobby Abellana (aider)" <bobby@abellana.work>
Date: Thu, 6 Feb 2025 19:07:42 -0800
Subject: [PATCH] fix: Refactor 52-week high calculation in industry leadership
 check

---
 src/screener/l_canslim.py | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/screener/l_canslim.py b/src/screener/l_canslim.py
index d87b116..40a1fc4 100644
--- a/src/screener/l_canslim.py
+++ b/src/screener/l_canslim.py
@@ -51,14 +51,26 @@ def check_industry_leadership(symbol):
 
     # Get RSI from stock_indicators and price data from stock_prices_daily
     metrics_query = f"""
-        WITH latest_price AS (
-            SELECT 
-                close as current_price,
-                MAX(close) OVER (RANGE BETWEEN INTERVAL 52 WEEK PRECEDING AND CURRENT ROW) as high_52_week
+        WITH latest_date AS (
+            SELECT MAX(date) as max_date
             FROM stock_db.stock_prices_daily
             WHERE ticker = '{symbol}'
-            ORDER BY date DESC
-            LIMIT 1
+        ),
+        year_range AS (
+            SELECT 
+                close as current_price,
+                (
+                    SELECT MAX(close)
+                    FROM stock_db.stock_prices_daily
+                    WHERE ticker = '{symbol}'
+                    AND date >= DATE_SUB(
+                        (SELECT max_date FROM latest_date),
+                        INTERVAL 52 WEEK
+                    )
+                ) as high_52_week
+            FROM stock_db.stock_prices_daily
+            WHERE ticker = '{symbol}'
+            AND date = (SELECT max_date FROM latest_date)
         ),
         latest_rsi AS (
             SELECT rsi
@@ -68,11 +80,11 @@ def check_industry_leadership(symbol):
             LIMIT 1
         )
         SELECT 
-            current_price,
-            high_52_week,
-            rsi
-        FROM latest_price
-        CROSS JOIN latest_rsi
+            yr.current_price,
+            yr.high_52_week,
+            lr.rsi
+        FROM year_range yr
+        CROSS JOIN latest_rsi lr
     """
 
     # Execute queries