finga/webhookey
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

Refactor filters

Browse source 
Clean up some comments and refactor the code to improve readability
and to get rid of "ugly" unwraps.
This commit is contained in:
finga 2021-11-13 14:16:21 +01:00
parent d92e8029f2
commit b4b46ebd58
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/webhooks.rs
View file

@ -72,10 +72,6 @@ impl JsonFilter {
); );
let regex = Regex::new(&self.regex).map_err(WebhookeyError::Regex)?; let regex = Regex::new(&self.regex).map_err(WebhookeyError::Regex)?;
// let value = self.get_string(data)?;
// if let Some(value) = self.get_string() {data.pointer(&self.pointer) {
// let value = get_string();
if let Some(value) = data.pointer(&self.pointer) { if let Some(value) = data.pointer(&self.pointer) {
if regex.is_match(&self.get_string(&value)?) { if regex.is_match(&self.get_string(&value)?) {
@ -121,33 +117,43 @@ impl FilterType {
pub fn evaluate(&self, data: &serde_json::Value) -> Result<bool, WebhookeyError> { pub fn evaluate(&self, data: &serde_json::Value) -> Result<bool, WebhookeyError> {
match self { match self {
FilterType::And(filters) => { FilterType::And(filters) => {
let (results, errors): (Vec<_>, Vec<_>) = filters let (mut results, mut errors) = (Vec::new(), Vec::new());
filters
.iter() .iter()
.map(|filter| filter.evaluate(data)) .map(|filter| filter.evaluate(data))
.partition(Result::is_ok); .for_each(|item| match item {
Ok(o) => results.push(o),
Err(e) => errors.push(e),
});
if errors.is_empty() { if errors.is_empty() {
Ok(results.iter().all(|r| *r.as_ref().unwrap())) // should never fail Ok(results.iter().all(|r| *r))
} else { } else {
errors.iter().for_each(|e| { errors
error!("Could not evaluate Filter: {}", e.as_ref().unwrap_err()) .iter()
}); .for_each(|e| error!("Could not evaluate Filter: {}", e));
Err(WebhookeyError::InvalidFilter) Err(WebhookeyError::InvalidFilter)
} }
} }
FilterType::Or(filters) => { FilterType::Or(filters) => {
let (results, errors): (Vec<_>, Vec<_>) = filters let (mut results, mut errors) = (Vec::new(), Vec::new());
filters
.iter() .iter()
.map(|filter| filter.evaluate(data)) .map(|filter| filter.evaluate(data))
.partition(Result::is_ok); .for_each(|item| match item {
Ok(o) => results.push(o),
Err(e) => errors.push(e),
});
if errors.is_empty() { if errors.is_empty() {
Ok(results.iter().any(|r| *r.as_ref().unwrap())) // should never fail Ok(results.iter().any(|r| *r))
} else { } else {
errors.iter().for_each(|e| { errors
error!("Could not evaluate Filter: {}", e.as_ref().unwrap_err()) .iter()
}); .for_each(|e| error!("Could not evaluate Filter: {}", e));
Err(WebhookeyError::InvalidFilter) Err(WebhookeyError::InvalidFilter)
} }