feat: handle comparison "greater or equal" for signed int condition

This commit is contained in:
2025-10-19 10:18:13 +02:00
parent 3feb0d464e
commit 3d6dfef254
2 changed files with 174 additions and 54 deletions

View File

@@ -32,6 +32,9 @@ pub fn run(filter: &Filter) -> Result<String, FailedTo> {
(Comparison::Lesser, Condition::SignedInt(_)) => { (Comparison::Lesser, Condition::SignedInt(_)) => {
compose_fragment(name, "value_int", "<", i + 1) compose_fragment(name, "value_int", "<", i + 1)
} }
(Comparison::GreaterOrEqual, Condition::SignedInt(_)) => {
compose_fragment(name, "value_int", ">=", i + 1)
}
_ => todo!(), _ => todo!(),
}; };
statement.push_str(&fragment); statement.push_str(&fragment);

View File

@@ -1706,62 +1706,179 @@ mod tests {
assert!(!catalog.items.contains_key("item-3")); assert!(!catalog.items.contains_key("item-3"));
std::fs::remove_file(path).unwrap(); std::fs::remove_file(path).unwrap();
} }
#[test] #[test]
fn load_by_filter_should_load_matching_lesser_sell_trend_edge_cases() { fn load_by_filter_should_load_matching_lesser_sell_trend_edge_cases() {
let db_path = "target/test_dbs/lbf_lesser_sell_trend_edge_cases.db"; let db_path = "target/test_dbs/lbf_lesser_sell_trend_edge_cases.db";
let path = std::path::Path::new(db_path); let path = std::path::Path::new(db_path);
std::fs::create_dir_all(path.parent().unwrap()).unwrap(); std::fs::create_dir_all(path.parent().unwrap()).unwrap();
if path.exists() { if path.exists() {
std::fs::remove_file(path).unwrap();
}
let mut catalog_setup = Catalog::new(db_path);
catalog_setup.init().unwrap();
let items = vec![
Item {
id: "item-1".to_string(),
name: "Item One".to_string(),
price: 100,
sell_trend: 10,
in_stock: true,
},
Item {
id: "item-2".to_string(),
name: "Item Two".to_string(),
price: 200,
sell_trend: -5,
in_stock: false,
},
Item {
id: "item-3".to_string(),
name: "Item Three".to_string(),
price: 300,
sell_trend: 20,
in_stock: true,
},
];
catalog_setup.insert_many(items).unwrap();
catalog_setup.persist().unwrap();
// Edge Case 1: Value equal to filter value should not be included.
let mut catalog1 = Catalog::new(db_path);
let filter1 = Filter::new().with_signed_int("sell_trend", Comparison::Lesser, 10);
assert!(catalog1.load_by_filter(&filter1).is_ok());
assert_eq!(catalog1.items.len(), 1);
assert!(catalog1.items.contains_key("item-2"));
// Edge Case 2: No values lesser than filter value.
let mut catalog2 = Catalog::new(db_path);
let filter2 = Filter::new().with_signed_int("sell_trend", Comparison::Lesser, -5);
assert!(catalog2.load_by_filter(&filter2).is_ok());
assert!(catalog2.items.is_empty());
// Edge Case 3: All values lesser than filter value.
let mut catalog3 = Catalog::new(db_path);
let filter3 = Filter::new().with_signed_int("sell_trend", Comparison::Lesser, 25);
assert!(catalog3.load_by_filter(&filter3).is_ok());
assert_eq!(catalog3.items.len(), 3);
assert!(catalog3.items.contains_key("item-1"));
assert!(catalog3.items.contains_key("item-2"));
assert!(catalog3.items.contains_key("item-3"));
std::fs::remove_file(path).unwrap(); std::fs::remove_file(path).unwrap();
} }
let mut catalog_setup = Catalog::new(db_path);
catalog_setup.init().unwrap(); #[test]
let items = vec![ fn load_by_filter_should_load_matching_greater_or_equal_sell_trend() {
Item { let db_path = "target/test_dbs/lbf_matching_greater_or_equal_sell_trend.db";
id: "item-1".to_string(), let path = std::path::Path::new(db_path);
name: "Item One".to_string(), std::fs::create_dir_all(path.parent().unwrap()).unwrap();
price: 100, if path.exists() {
sell_trend: 10, std::fs::remove_file(path).unwrap();
in_stock: true, }
},
Item { let mut catalog_setup = Catalog::new(db_path);
id: "item-2".to_string(), catalog_setup.init().unwrap();
name: "Item Two".to_string(), let items = vec![
price: 200, Item {
sell_trend: -5, id: "item-1".to_string(),
in_stock: false, name: "Item One".to_string(),
}, price: 100,
Item { sell_trend: 10,
id: "item-3".to_string(), in_stock: true,
name: "Item Three".to_string(), },
price: 300, Item {
sell_trend: 20, id: "item-2".to_string(),
in_stock: true, name: "Item Two".to_string(),
}, price: 200,
]; sell_trend: -5,
catalog_setup.insert_many(items).unwrap(); in_stock: false,
catalog_setup.persist().unwrap(); },
// Edge Case 1: Value equal to filter value should not be included. Item {
let mut catalog1 = Catalog::new(db_path); id: "item-3".to_string(),
let filter1 = Filter::new().with_signed_int("sell_trend", Comparison::Lesser, 10); name: "Item Three".to_string(),
assert!(catalog1.load_by_filter(&filter1).is_ok()); price: 300,
assert_eq!(catalog1.items.len(), 1); sell_trend: 20,
assert!(catalog1.items.contains_key("item-2")); in_stock: true,
// Edge Case 2: No values lesser than filter value. },
let mut catalog2 = Catalog::new(db_path); ];
let filter2 = Filter::new().with_signed_int("sell_trend", Comparison::Lesser, -5); catalog_setup.insert_many(items).unwrap();
assert!(catalog2.load_by_filter(&filter2).is_ok()); catalog_setup.persist().unwrap();
assert!(catalog2.items.is_empty());
// Edge Case 3: All values lesser than filter value. let mut catalog = Catalog::new(db_path);
let mut catalog3 = Catalog::new(db_path); let filter = Filter::new().with_signed_int("sell_trend", Comparison::GreaterOrEqual, 10);
let filter3 = Filter::new().with_signed_int("sell_trend", Comparison::Lesser, 25); assert!(catalog.load_by_filter(&filter).is_ok());
assert!(catalog3.load_by_filter(&filter3).is_ok());
assert_eq!(catalog3.items.len(), 3); assert_eq!(catalog.items.len(), 2);
assert!(catalog3.items.contains_key("item-1")); assert!(catalog.items.contains_key("item-1"));
assert!(catalog3.items.contains_key("item-2")); assert!(!catalog.items.contains_key("item-2"));
assert!(catalog3.items.contains_key("item-3")); assert!(catalog.items.contains_key("item-3"));
std::fs::remove_file(path).unwrap();
} std::fs::remove_file(path).unwrap();
}
#[test]
fn load_by_filter_should_load_matching_greater_or_equal_sell_trend_edge_cases() {
let db_path = "target/test_dbs/lbf_greater_or_equal_sell_trend_edge_cases.db";
let path = std::path::Path::new(db_path);
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
if path.exists() {
std::fs::remove_file(path).unwrap();
}
let mut catalog_setup = Catalog::new(db_path);
catalog_setup.init().unwrap();
let items = vec![
Item {
id: "item-1".to_string(),
name: "Item One".to_string(),
price: 100,
sell_trend: 10,
in_stock: true,
},
Item {
id: "item-2".to_string(),
name: "Item Two".to_string(),
price: 200,
sell_trend: -5,
in_stock: false,
},
Item {
id: "item-3".to_string(),
name: "Item Three".to_string(),
price: 300,
sell_trend: 20,
in_stock: true,
},
];
catalog_setup.insert_many(items).unwrap();
catalog_setup.persist().unwrap();
// Edge Case 1: Value equal to filter value should be included.
let mut catalog1 = Catalog::new(db_path);
let filter1 = Filter::new().with_signed_int("sell_trend", Comparison::GreaterOrEqual, 20);
assert!(catalog1.load_by_filter(&filter1).is_ok());
assert_eq!(catalog1.items.len(), 1);
assert!(catalog1.items.contains_key("item-3"));
// Edge Case 2: No values greater than or equal to filter value.
let mut catalog2 = Catalog::new(db_path);
let filter2 = Filter::new().with_signed_int("sell_trend", Comparison::GreaterOrEqual, 21);
assert!(catalog2.load_by_filter(&filter2).is_ok());
assert!(catalog2.items.is_empty());
// Edge Case 3: All values greater than or equal to filter value.
let mut catalog3 = Catalog::new(db_path);
let filter3 = Filter::new().with_signed_int("sell_trend", Comparison::GreaterOrEqual, -5);
assert!(catalog3.load_by_filter(&filter3).is_ok());
assert_eq!(catalog3.items.len(), 3);
assert!(catalog3.items.contains_key("item-1"));
assert!(catalog3.items.contains_key("item-2"));
assert!(catalog3.items.contains_key("item-3"));
std::fs::remove_file(path).unwrap();
}
// ## Integration Tests // ## Integration Tests
#[test] #[test]
fn integration_test_init_insert_persist_load_get() { fn integration_test_init_insert_persist_load_get() {