Skip to content

fix: counts api #1532

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.

Sign up for GitHub

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

Open
nikhilsinhaparseable wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: counts api #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a54fa3
fix: counts api
nikhilsinhaparseable Jan 28, 2026
a8759f7
deepsource fix
nikhilsinhaparseable Jan 28, 2026
f1a6869
fix list type
nikhilsinhaparseable Jan 28, 2026
5ad6b4f
parse bool/f64, escape
nikhilsinhaparseable Jan 28, 2026
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
3 changes: 3 additions & 0 deletions src/alerts/alert_structs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ pub struct ConditionConfig {
pub column: String,
pub operator: WhereConfigOperator,
pub value: Option<String>,
#[serde(rename = "type")]
#[serde(default)]
pub column_type: Option<String>,
}

#[derive(Debug, serde::Serialize, serde::Deserialize, Clone)]
Expand Down
198 changes: 120 additions & 78 deletions src/alerts/alerts_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use tracing::trace;
use crate::{
alerts::{
AlertTrait, LogicalOperator, WhereConfigOperator,
alert_structs::{AlertQueryResult, Conditions, GroupResult},
alert_structs::{AlertQueryResult, ConditionConfig, Conditions, GroupResult},
extract_aggregate_aliases,
},
handlers::http::{
Expand Down Expand Up @@ -364,84 +364,8 @@ pub fn get_filter_string(where_clause: &Conditions) -> Result<String, String> {
&LogicalOperator::And => {
let mut exprs = vec![];
for condition in &where_clause.condition_config {
if condition.value.as_ref().is_some_and(|v| !v.is_empty()) {
// ad-hoc error check in case value is some and operator is either `is null` or `is not null`
if condition.operator.eq(&WhereConfigOperator::IsNull)
|| condition.operator.eq(&WhereConfigOperator::IsNotNull)
{
return Err("value must be null when operator is either `is null` or `is not null`"
.into());
}

let value = condition.value.as_ref().unwrap();

let operator_and_value = match condition.operator {
WhereConfigOperator::Contains => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("LIKE '%{escaped_value}%' ESCAPE '\\'")
}
WhereConfigOperator::DoesNotContain => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("NOT LIKE '%{escaped_value}%' ESCAPE '\\'")
}
WhereConfigOperator::ILike => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("ILIKE '%{escaped_value}%' ESCAPE '\\'")
}
WhereConfigOperator::BeginsWith => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("LIKE '{escaped_value}%' ESCAPE '\\'")
}
WhereConfigOperator::DoesNotBeginWith => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("NOT LIKE '{escaped_value}%' ESCAPE '\\'")
}
WhereConfigOperator::EndsWith => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("LIKE '%{escaped_value}' ESCAPE '\\'")
}
WhereConfigOperator::DoesNotEndWith => {
let escaped_value = value
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
format!("NOT LIKE '%{escaped_value}' ESCAPE '\\'")
}
_ => {
let value = match ValueType::from_string(value.to_owned()) {
ValueType::Number(val) => format!("{val}"),
ValueType::Boolean(val) => format!("{val}"),
ValueType::String(val) => {
format!("'{val}'")
}
};
format!("{} {}", condition.operator, value)
}
};
exprs.push(format!("\"{}\" {}", condition.column, operator_and_value))
} else {
exprs.push(format!("\"{}\" {}", condition.column, condition.operator))
}
exprs.push(condition_to_expr(condition)?);
}

Ok(exprs.join(" AND "))
}
_ => Err(String::from("Invalid option 'or', only 'and' is supported")),
Expand All @@ -452,6 +376,124 @@ pub fn get_filter_string(where_clause: &Conditions) -> Result<String, String> {
}
}

fn condition_to_expr(condition: &ConditionConfig) -> Result<String, String> {
// is null / is not null don't take a value
if condition.operator == WhereConfigOperator::IsNull
|| condition.operator == WhereConfigOperator::IsNotNull
{
if condition.value.as_ref().is_some_and(|v| !v.is_empty()) {
return Err(
"value must be null when operator is either `is null` or `is not null`".into(),
);
}
return Ok(format!("\"{}\" {}", condition.column, condition.operator));
}

let value = condition.value.as_deref().unwrap_or("");

let is_list_type = condition
.column_type
.as_ref()
.is_some_and(|t| t.starts_with("list"));

if is_list_type {
list_condition_expr(&condition.column, &condition.operator, value)
} else {
scalar_condition_expr(
&condition.column,
&condition.operator,
value,
condition.column_type.as_deref(),
)
}
}

fn list_condition_expr(
column: &str,
operator: &WhereConfigOperator,
value: &str,
) -> Result<String, String> {
// Strip surrounding brackets if present to avoid nested arrays
let inner_value = value
.trim()
.strip_prefix('[')
.and_then(|s| s.strip_suffix(']'))
.unwrap_or(value);

match operator {
WhereConfigOperator::Contains => {
Ok(format!("array_has_all(\"{column}\", ARRAY[{inner_value}])"))
}
WhereConfigOperator::DoesNotContain => Ok(format!(
"NOT array_has_all(\"{column}\", ARRAY[{inner_value}])"
)),
WhereConfigOperator::Equal => Ok(format!("\"{column}\" = ARRAY[{inner_value}]")),
WhereConfigOperator::NotEqual => Ok(format!("\"{column}\" != ARRAY[{inner_value}]")),
_ => Err(format!(
"Operator '{operator}' is not supported for list type columns"
)),
}
}

fn scalar_condition_expr(
column: &str,
operator: &WhereConfigOperator,
value: &str,
column_type: Option<&str>,
) -> Result<String, String> {
let operator_and_value = match operator {
WhereConfigOperator::Contains => {
format!("LIKE '%{}%' ESCAPE '\\'", escape_like(value))
}
WhereConfigOperator::DoesNotContain => {
format!("NOT LIKE '%{}%' ESCAPE '\\'", escape_like(value))
}
WhereConfigOperator::ILike => {
format!("ILIKE '%{}%' ESCAPE '\\'", escape_like(value))
}
WhereConfigOperator::BeginsWith => {
format!("LIKE '{}%' ESCAPE '\\'", escape_like(value))
}
WhereConfigOperator::DoesNotBeginWith => {
format!("NOT LIKE '{}%' ESCAPE '\\'", escape_like(value))
}
WhereConfigOperator::EndsWith => {
format!("LIKE '%{}' ESCAPE '\\'", escape_like(value))
}
WhereConfigOperator::DoesNotEndWith => {
format!("NOT LIKE '%{}' ESCAPE '\\'", escape_like(value))
}
_ => {
let formatted = match column_type {
Some("bool") | Some("boolean") => value
.parse::<bool>()
.map_err(|_| format!("Invalid boolean literal: {value}"))?
.to_string(),
Some("int") | Some("float") | Some("number") => value
.parse::<f64>()
.map_err(|_| format!("Invalid numeric literal: {value}"))?
.to_string(),
Some(_) => format!("'{}'", value.replace("'", "''")),
None => match ValueType::from_string(value.to_owned()) {
ValueType::Number(val) => format!("{val}"),
ValueType::Boolean(val) => format!("{val}"),
ValueType::String(val) => format!("'{}'", val.replace("'", "''")),
},
};
format!("{operator} {formatted}")
}
};
Ok(format!("\"{column}\" {operator_and_value}"))
}

fn escape_like(value: &str) -> String {
value
.replace('\\', "\\\\")
.replace('\'', "''")
.replace('%', "\\%")
.replace('_', "\\_")
}

enum ValueType {
Number(f64),
String(String),
Expand Down
Loading