Recombined bot and service, fixed dockerfile
This commit is contained in:
@@ -27,6 +27,7 @@ pub struct QuerySpell {
|
||||
#[derive(Debug)]
|
||||
pub struct QueryFilters {
|
||||
pub by_name: Option<String>,
|
||||
pub like_name: Option<String>,
|
||||
pub by_schools: Option<Vec<String>>,
|
||||
pub by_levels: Option<Vec<i32>>,
|
||||
pub by_ritual: Option<bool>,
|
||||
@@ -43,6 +44,7 @@ impl Default for QueryFilters {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
by_name: None,
|
||||
like_name: None,
|
||||
by_schools: None,
|
||||
by_levels: None,
|
||||
by_ritual: None,
|
||||
@@ -65,6 +67,9 @@ impl QuerySpell {
|
||||
let offset = (page - 1) * limit;
|
||||
query = query.offset(offset as i64);
|
||||
if let Some(name) = &filters.by_name {
|
||||
query = query.filter(spells::name.eq(name));
|
||||
}
|
||||
if let Some(name) = &filters.like_name {
|
||||
query = query.filter(spells::name.ilike(format!("%{}%", name)));
|
||||
}
|
||||
if let Some(schools) = &filters.by_schools {
|
||||
|
||||
Reference in New Issue
Block a user