feat: standardize field names

Author: Devdutt Shenoi

src/handlers/http/query.rs

@@ -114,14 +114,14 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result<HttpRespons
         };
         let count_records = counts_req.get_bin_density().await?;
         // NOTE: this should not panic, since there is atleast one bin, always
-        let log_count = count_records[0].log_count;
+        let count = count_records[0].count;
         let response = if query_request.fields {
             json!({
                 "fields": [&column_name],
-                "records": [json!({column_name: log_count})]
+                "records": [json!({column_name: count})]
             })
         } else {
-            Value::Array(vec![json!({column_name: log_count})])
+            Value::Array(vec![json!({column_name: count})])
         };
 
         let time = time.elapsed().as_secs_f64();
@@ -164,11 +164,7 @@ pub async fn get_counts(
     let records = counts_request.get_bin_density().await?;
 
     Ok(web::Json(CountsResponse {
-        fields: vec![
-            "counts_start_timestamp".into(),
-            "counts_end_timestamp".into(),
-            "log_count".into(),
-        ],
+        fields: vec!["start_time".into(), "end_time".into(), "count".into()],
         records,
     }))
 }

src/query/mod.rs

@@ -248,11 +248,11 @@ impl Query {
 #[derive(Debug, Serialize, Clone)]
 pub struct CountsRecord {
     /// Start time of the bin
-    pub counts_start_timestamp: String,
+    pub start_time: String,
     /// End time of the bin
-    pub counts_end_timestamp: String,
+    pub end_time: String,
     /// Number of logs in the bin
-    pub log_count: u64,
+    pub count: u64,
 }
 
 struct TimeBounds {
@@ -299,10 +299,14 @@ impl CountsRequest {
 
         for bin in counts {
             // extract start and end time to compare
-            let counts_start_timestamp = bin.start.timestamp_millis();
-            let counts_end_timestamp = bin.end.timestamp_millis();
+            let start_time = DateTime::from_timestamp_millis(bin.start.timestamp_millis())
+                .unwrap()
+                .to_rfc3339();
+            let end_time = DateTime::from_timestamp_millis(bin.end.timestamp_millis())
+                .unwrap()
+                .to_rfc3339();
             // Sum up the number of rows that fall within the bin
-            let log_count: u64 = all_manifest_files
+            let count: u64 = all_manifest_files
                 .iter()
                 .flat_map(|m| &m.files)
                 .filter_map(|f| {
@@ -324,13 +328,9 @@ impl CountsRequest {
                 .sum();
 
             counts_records.push(CountsRecord {
-                counts_start_timestamp: DateTime::from_timestamp_millis(counts_start_timestamp)
-                    .unwrap()
-                    .to_rfc3339(),
-                counts_end_timestamp: DateTime::from_timestamp_millis(counts_end_timestamp)
-                    .unwrap()
-                    .to_rfc3339(),
-                log_count,
+                start_time,
+                end_time,
+                count,
             });
         }
         Ok(counts_records)