fixed sql

dashboard/server.py

@@ -83,46 +83,59 @@ async def get_analytics(
     isins: str = None,
     continents: str = None
 ):
+    # Determine if we need to join metadata
+    needs_metadata = any([
+        group_by in ["name", "continent", "sector"],
+        sub_group_by in ["name", "continent", "sector"],
+        continents is not None
+    ])
+    
+    # Use prefixes only if joining
+    t_prefix = "t." if needs_metadata else ""
+    m_prefix = "m." if needs_metadata else ""
+    
     metrics_map = {
-        "volume": "sum(t.price * t.quantity)",
-        "count": "count(*)",
-        "avg_price": "avg(t.price)"
+        "volume": f"sum({t_prefix}price * {t_prefix}quantity)",
+        "count": f"count(*)",
+        "avg_price": f"avg({t_prefix}price)"
     }
     
     groups_map = {
-        "day": "date_trunc('day', t.timestamp)",
-        "month": "date_trunc('month', t.timestamp)",
-        "exchange": "t.exchange",
-        "isin": "t.isin",
-        "name": "coalesce(m.name, t.isin)",
-        "continent": "coalesce(m.continent, 'Unknown')",
-        "sector": "coalesce(m.sector, 'Unknown')"
+        "day": f"date_trunc('day', {t_prefix}timestamp)",
+        "month": f"date_trunc('month', {t_prefix}timestamp)",
+        "exchange": f"{t_prefix}exchange",
+        "isin": f"{t_prefix}isin",
+        "name": f"coalesce({m_prefix}name, {t_prefix}isin)" if needs_metadata else "isin",
+        "continent": f"coalesce({m_prefix}continent, 'Unknown')" if needs_metadata else "'Unknown'",
+        "sector": f"coalesce({m_prefix}sector, 'Unknown')" if needs_metadata else "'Unknown'"
     }
     
     selected_metric = metrics_map.get(metric, metrics_map["volume"])
     selected_group = groups_map.get(group_by, groups_map["day"])
     
-    # We always join metadata to allow filtering by continent/sector even if not grouping by them
     query = f"select {selected_group} as label"
     
     if sub_group_by and sub_group_by in groups_map:
         query += f", {groups_map[sub_group_by]} as sub_label"
         
-    query += f", {selected_metric} as value from trades t"
-    query += " left join metadata m on t.isin = m.isin where 1=1"
+    query += f", {selected_metric} as value from trades"
+    if needs_metadata:
+        query += " t left join metadata m on t.isin = m.isin"
+    
+    query += " where 1=1"
     
     if date_from:
-        query += f" and t.timestamp >= '{date_from}'"
+        query += f" and {t_prefix}timestamp >= '{date_from}'"
     if date_to:
-        query += f" and t.timestamp <= '{date_to}'"
+        query += f" and {t_prefix}timestamp <= '{date_to}'"
         
     if isins:
         isins_list = ",".join([f"'{i.strip()}'" for i in isins.split(",")])
-        query += f" and t.isin in ({isins_list})"
+        query += f" and {t_prefix}isin in ({isins_list})"
 
-    if continents:
+    if continents and needs_metadata:
         cont_list = ",".join([f"'{c.strip()}'" for c in continents.split(",")])
-        query += f" and m.continent in ({cont_list})"
+        query += f" and {m_prefix}continent in ({cont_list})"
         
     query += " group by label"
     if sub_group_by and sub_group_by in groups_map: