From ee6b83b31146f029700dc484ba0d539876bb5458 Mon Sep 17 00:00:00 2001
From: yenicelik <david.yenicelik@gmail.com>
Date: Fri, 9 Jun 2023 00:03:37 +0200
Subject: [PATCH] fixed aggregate

---
 web3_proxy/src/stats/influxdb_queries.rs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/web3_proxy/src/stats/influxdb_queries.rs b/web3_proxy/src/stats/influxdb_queries.rs
index b303d40d..97dff7be 100644
--- a/web3_proxy/src/stats/influxdb_queries.rs
+++ b/web3_proxy/src/stats/influxdb_queries.rs
@@ -167,6 +167,23 @@ pub async fn query_user_stats<'a>(
         StatType::Detailed => "".to_string(),
     };
 
+    let join_candidates = match stat_response_type {
+        StatType::Aggregated => f!(
+            r#"{:?}"#,
+            vec!["_time", "_measurement", "chain_id", "rpc_secret_key_id"]
+        ),
+        StatType::Detailed => f!(
+            r#"{:?}"#,
+            vec![
+                "_time",
+                "_measurement",
+                "method",
+                "chain_id",
+                "rpc_secret_key_id"
+            ]
+        ),
+    };
+
     let query = f!(r#"
     base = from(bucket: "{bucket}")
         |> range(start: {query_start}, stop: {query_stop})
@@ -198,10 +215,9 @@ pub async fn query_user_stats<'a>(
 
     join(
         tables: {{cumsum, balance}},
-        on: ["_time", "_measurement", "chain_id", "method", "rpc_secret_key_id"]
+        on: {join_candidates}
     )
-    |> sort(columns: ["_time", "_measurement", "chain_id", "method", "rpc_secret_key_id"], desc: true)
-
+        |> sort(columns: ["_time", "_measurement", "chain_id", "method", "rpc_secret_key_id"], desc: true)
     "#);
 
     debug!("Raw query to db is: {:#?}", query);