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.

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

Jump to bottom

Add additional filters #92

Closed
wants to merge 4 commits into from
Closed

Add additional filters #92

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
3cfda01
Add string filter
hgiesel Nov 6, 2022
13564f6
Allow additional filters for all types
hgiesel Nov 6, 2022
7837c44
Remove old changes
hgiesel Nov 6, 2022
d8653eb
Fix missing ident
hgiesel Nov 6, 2022
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
22 changes: 21 additions & 1 deletion derive/src/filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ pub fn recursive_filter_fn(fields: &[IdentTypeTuple]) -> Result<TokenStream, cra

let column_enum_name = format_ident!("{}", ident.to_string().to_upper_camel_case());

quote!{
quote! {
if let Some(#column_name) = current_filter.#column_name {
if let Some(eq_value) = #column_name.eq {
condition = condition.add(Column::#column_enum_name.eq(eq_value))
Expand Down Expand Up @@ -239,6 +239,26 @@ pub fn recursive_filter_fn(fields: &[IdentTypeTuple]) -> Result<TokenStream, cra
condition = condition.add(Column::#column_enum_name.is_null())
}
}

if let Some(contains_value) = #column_name.contains {
condition = condition.add(Column::#column_enum_name.contains(contains_value.as_str()))
}

if let Some(starts_with_value) = #column_name.starts_with {
condition = condition.add(Column::#column_enum_name.starts_with(starts_with_value.as_str()))
}

if let Some(ends_with_value) = #column_name.ends_with {
condition = condition.add(Column::#column_enum_name.ends_with(ends_with_value.as_str()))
}

if let Some(like_value) = #column_name.like {
condition = condition.add(Column::#column_enum_name.like(like_value.as_str()))
}

if let Some(not_like_value) = #column_name.not_like {
condition = condition.add(Column::#column_enum_name.not_like(not_like_value.as_str()))
}
}
}
})
Expand Down
5 changes: 5 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ pub struct TypeFilter<T: async_graphql::InputType> {
pub is_in: Option<Vec<T>>,
pub is_not_in: Option<Vec<T>>,
pub is_null: Option<bool>,
pub contains: Option<String>,
pub starts_with: Option<String>,
pub ends_with: Option<String>,
pub like: Option<String>,
pub not_like: Option<String>,
}

#[derive(Debug, async_graphql::InputObject)]
Expand Down