herocode/db
13
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge issues and rhai examples wip

Browse Source
This commit is contained in:
timurgordon
2025-05-22 23:57:33 +03:00
parent 93950bcab4
commit 0da512484f
28 changed files with 780 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
heromodels/src/models/biz/rhai.rs
View File

@@ -43,7 +43,7 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
engine.register_type_with_name::<Company>("Company");
// Constructor
engine.register_fn("new_company", |id: i64, name: String, registration_number: String, incorporation_date: i64| -> Result<Company, Box<EvalAltResult>> { Ok(Company::new(id as u32, name, registration_number, incorporation_date)) });
engine.register_fn("new_company", |name: String, registration_number: String, incorporation_date: i64| -> Result<Company, Box<EvalAltResult>> { Ok(Company::new(name, registration_number, incorporation_date)) });
// Getters for Company
engine.register_get("id", |company: &mut Company| -> Result<i64, Box<EvalAltResult>> { Ok(company.get_id() as i64) });
@@ -85,9 +85,7 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
engine.register_type_with_name::<Shareholder>("Shareholder");
// Constructor for Shareholder (minimal, takes only ID)
engine.register_fn("new_shareholder", |id: i64| -> Result<Shareholder, Box<EvalAltResult>> {
Ok(Shareholder::new(id as u32))
});
engine.register_fn("new_shareholder", || -> Result<Shareholder, Box<EvalAltResult>> { Ok(Shareholder::new()) });
// Getters for Shareholder
engine.register_get("id", |shareholder: &mut Shareholder| -> Result<i64, Box<EvalAltResult>> { Ok(shareholder.get_id() as i64) });
@@ -147,7 +145,7 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
// --- Product ---
engine.register_type_with_name::<Product>("Product")
.register_fn("new_product", |id: i64| -> Result<Product, Box<EvalAltResult>> { Ok(Product::new(id as u32)) })
.register_fn("new_product", || -> Result<Product, Box<EvalAltResult>> { Ok(Product::new()) })
// Getters for Product
.register_get("id", |p: &mut Product| -> Result<i64, Box<EvalAltResult>> { Ok(p.base_data.id as i64) })
.register_get("name", |p: &mut Product| -> Result<String, Box<EvalAltResult>> { Ok(p.name.clone()) })
@@ -212,9 +210,7 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
// --- Sale ---
engine.register_type_with_name::<Sale>("Sale");
engine.register_fn("new_sale", |id_i64: i64, company_id_i64: i64, buyer_name: String, buyer_email: String, total_amount: f64, status: SaleStatus, sale_date: i64| -> Result<Sale, Box<EvalAltResult>> {
Ok(Sale::new(id_from_i64(id_i64)?, id_from_i64(company_id_i64)?, buyer_name, buyer_email, total_amount, status, sale_date))
});
engine.register_fn("new_sale", |company_id_i64: i64, buyer_name: String, buyer_email: String, total_amount: f64, status: SaleStatus, sale_date: i64| -> Result<Sale, Box<EvalAltResult>> { Ok(Sale::new(id_from_i64(company_id_i64)?, buyer_name, buyer_email, total_amount, status, sale_date)) });
// Getters for Sale
engine.register_get("id", |s: &mut Sale| -> Result<i64, Box<EvalAltResult>> { Ok(s.get_id() as i64) });
@@ -257,11 +253,14 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
});
// DB functions for Product
let captured_db_for_set_prod = Arc::clone(&db);
engine.register_fn("set_product", move |product: Product| -> Result<(), Box<EvalAltResult>> {
captured_db_for_set_prod.set(&product).map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Product (ID: {}): {}", product.get_id(), e).into(), Position::NONE))
})
let captured_db_for_set_product = Arc::clone(&db);
engine.register_fn("set_product", move |product: Product| -> Result<Product, Box<EvalAltResult>> {
let original_id_for_error = product.get_id();
captured_db_for_set_product.set(&product)
.map(|(_id, updated_product)| updated_product)
.map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Product (Original ID: {}): {}", original_id_for_error, e).into(), Position::NONE))
})
});
let captured_db_for_get_prod = Arc::clone(&db);
@@ -274,10 +273,13 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
// DB functions for Sale
let captured_db_for_set_sale = Arc::clone(&db);
engine.register_fn("set_sale", move |sale: Sale| -> Result<(), Box<EvalAltResult>> {
captured_db_for_set_sale.set(&sale).map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Sale (ID: {}): {}", sale.get_id(), e).into(), Position::NONE))
})
engine.register_fn("set_sale", move |sale: Sale| -> Result<Sale, Box<EvalAltResult>> {
let original_id_for_error = sale.get_id();
captured_db_for_set_sale.set(&sale)
.map(|(_id, updated_sale)| updated_sale)
.map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Sale (Original ID: {}): {}", original_id_for_error, e).into(), Position::NONE))
})
});
let captured_db_for_get_sale = Arc::clone(&db);
@@ -289,11 +291,14 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
});
// Mock DB functions for Shareholder
let captured_db_for_set_sh = Arc::clone(&db);
engine.register_fn("set_shareholder", move |shareholder: Shareholder| -> Result<(), Box<EvalAltResult>> {
captured_db_for_set_sh.set(&shareholder).map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Shareholder (ID: {}): {}", shareholder.get_id(), e).into(), Position::NONE))
})
let captured_db_for_set_shareholder = Arc::clone(&db);
engine.register_fn("set_shareholder", move |shareholder: Shareholder| -> Result<Shareholder, Box<EvalAltResult>> {
let original_id_for_error = shareholder.get_id();
captured_db_for_set_shareholder.set(&shareholder)
.map(|(_id, updated_shareholder)| updated_shareholder)
.map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Shareholder (Original ID: {}): {}", original_id_for_error, e).into(), Position::NONE))
})
});
let captured_db_for_get_sh = Arc::clone(&db);
@@ -305,11 +310,14 @@ pub fn register_biz_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
});
// Mock DB functions for Company
let captured_db_for_set = Arc::clone(&db);
engine.register_fn("set_company", move |company: Company| -> Result<(), Box<EvalAltResult>> {
captured_db_for_set.set(&company).map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Company (ID: {}): {}", company.get_id(), e).into(), Position::NONE))
})
let captured_db_for_set_company = Arc::clone(&db);
engine.register_fn("set_company", move |company: Company| -> Result<Company, Box<EvalAltResult>> {
let original_id_for_error = company.get_id(); // Capture ID before it's potentially changed by DB
captured_db_for_set_company.set(&company)
.map(|(_id, updated_company)| updated_company) // Use the model returned by db.set()
.map_err(|e| {
Box::new(EvalAltResult::ErrorRuntime(format!("Failed to set Company (Original ID: {}): {}", original_id_for_error, e).into(), Position::NONE))
})
});
let captured_db_for_get = Arc::clone(&db);