Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for list filters API #1257

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions src/handlers/http/users/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,59 @@ use actix_web::{
use bytes::Bytes;
use chrono::Utc;
use http::StatusCode;
use once_cell::sync::Lazy;
use regex::Regex;
use serde_json::Error as SerdeError;

#[derive(Debug, Default)]
struct FilterQueryParams {
stream: Option<String>,
user_id: Option<String>,
type_param: Option<String>,
}

static FILTER_QUERY_PARAMS_RE: Lazy<Regex> =
Lazy::new(|| Regex::new(r"(?:^|&)(stream|user_id|type)=([^&]*)").unwrap());

pub async fn list(req: HttpRequest) -> Result<impl Responder, FiltersError> {
let key =
extract_session_key_from_req(&req).map_err(|e| FiltersError::Custom(e.to_string()))?;
let filters = FILTERS.list_filters(&key).await;
Ok((web::Json(filters), StatusCode::OK))
let mut filters = FILTERS.list_filters(&key).await;

let query_string = req.query_string();
if query_string.is_empty() {
Ok((web::Json(filters), StatusCode::OK))
} else {
let mut params = FilterQueryParams::default();

let re = FILTER_QUERY_PARAMS_RE.clone();

for cap in re.captures_iter(query_string) {
let key = cap.get(1).unwrap().as_str();
let value = cap.get(2).unwrap().as_str().to_string();

match key {
"stream" => params.stream = Some(value),
"user_id" => params.user_id = Some(value),
"type" => params.type_param = Some(value),
_ => {} // This shouldn't happen with our regex
}
}

if params.stream.is_some() {
filters.retain(|f| f.stream_name.eq(params.stream.as_ref().unwrap()));
}

if params.user_id.is_some() {
filters.retain(|f| f.user_id == Some(params.user_id.clone().unwrap()));
}

if params.type_param.is_some() {
filters.retain(|f| f.query.filter_type == params.type_param.clone().unwrap());
}

Ok((web::Json(filters), StatusCode::OK))
}
}

pub async fn get(
Expand Down
Loading