use web query for date stats

Author: nikhilsinhaparseable

src/handlers/http/logstream.rs

@@ -524,6 +524,8 @@ pub mod error {
         HotTierValidation(#[from] HotTierValidationError),
         #[error("{0}")]
         HotTierError(#[from] HotTierError),
+        #[error("Invalid query parameter: {0}")]
+        InvalidQueryParameter(String),
     }
 
     impl actix_web::ResponseError for StreamError {
@@ -559,6 +561,7 @@ pub mod error {
                 StreamError::HotTierNotEnabled(_) => StatusCode::FORBIDDEN,
                 StreamError::HotTierValidation(_) => StatusCode::BAD_REQUEST,
                 StreamError::HotTierError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+                StreamError::InvalidQueryParameter(_) => StatusCode::BAD_REQUEST,
             }
         }
 

src/handlers/http/modal/query/querier_logstream.rs

@@ -17,7 +17,7 @@
  */
 
 use core::str;
-use std::fs;
+use std::{collections::HashMap, fs};
 
 use actix_web::{
     web::{self, Path},
@@ -47,6 +47,7 @@ use crate::{
     stats,
     storage::{ObjectStoreFormat, StreamType, STREAM_ROOT_DIRECTORY},
 };
+const STATS_DATE_QUERY_PARAM: &str = "date";
 
 pub async fn delete(stream_name: Path<String>) -> Result<impl Responder, StreamError> {
     let stream_name = stream_name.into_inner();
@@ -141,16 +142,13 @@ pub async fn get_stats(
         return Err(StreamNotFound(stream_name.clone()).into());
     }
 
-    let query_string = req.query_string();
-    if !query_string.is_empty() {
-        let date_key = query_string.split('=').collect::<Vec<&str>>()[0];
-        let date_value = query_string.split('=').collect::<Vec<&str>>()[1];
-        if date_key != "date" {
-            return Err(StreamError::Custom {
-                msg: "Invalid query parameter".to_string(),
-                status: StatusCode::BAD_REQUEST,
-            });
-        }
+    let query_map = web::Query::<HashMap<String, String>>::from_query(req.query_string())
+        .map_err(|_| StreamError::InvalidQueryParameter(STATS_DATE_QUERY_PARAM.to_string()))?;
+
+    if !query_map.is_empty() {
+        let date_value = query_map.get(STATS_DATE_QUERY_PARAM).ok_or_else(|| {
+            StreamError::InvalidQueryParameter(STATS_DATE_QUERY_PARAM.to_string())
+        })?;
 
         if !date_value.is_empty() {
             // this function requires all the ingestor stream jsons
@@ -180,7 +178,7 @@ pub async fn get_stats(
 
             let stats = serde_json::to_value(stats)?;
 
-            return Ok((web::Json(stats), StatusCode::OK));
+            return Ok(web::Json(stats));
         }
     }
 
@@ -227,5 +225,5 @@ pub async fn get_stats(
 
     let stats = serde_json::to_value(stats)?;
 
-    Ok((web::Json(stats), StatusCode::OK))
+    Ok(web::Json(stats))
 }