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

feat: Support incremental mode:

Browse Source 
- Support incremental mode in heromodels
- Updated the example to refelct the changes
- Updated the tests to reflect the changes
This commit is contained in:
Mahmoud Emad 2025-05-17 11:12:09 +03:00
parent bd4770b99b
commit bde5db0e52
16 changed files with 1074 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.gitignore vendored
View File

@ -4,3 +4,22 @@ target/
*.wasm *.wasm
herovm_build/ herovm_build/
test_db test_db
<<<<<<< Updated upstream
=======
# Node.js
**/node_modules/
**/dist/
**/*.log
**/package-lock.json
# TypeScript
**/*.js.map
**/*.d.ts
**/*.tsbuildinfo
rhaiinterface/client/**/*.js
rhaiinterface/server/**/*.js
!rhaiinterface/server/examples/**/client.js
!rhaiinterface/server/examples/webpack.config.js
.vscode
>>>>>>> Stashed changes

507
adapter_macros/Cargo.lock generated Normal file
View File

@ -0,0 +1,507 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 4
[[package]]
name = "adapter_macros"
version = "0.1.0"
dependencies = [
"chrono",
"rhai",
]
[[package]]
name = "ahash"
version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
"const-random",
"getrandom 0.3.3",
"once_cell",
"version_check",
"zerocopy",
]
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_system_properties"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
"libc",
]
[[package]]
name = "autocfg"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
[[package]]
name = "bumpalo"
version = "3.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
[[package]]
name = "cc"
version = "1.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
dependencies = [
"shlex",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
"wasm-bindgen",
"windows-link",
]
[[package]]
name = "const-random"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
dependencies = [
"const-random-macro",
]
[[package]]
name = "const-random-macro"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
dependencies = [
"getrandom 0.2.16",
"once_cell",
"tiny-keccak",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "crunchy"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
[[package]]
name = "getrandom"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "getrandom"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasi 0.14.2+wasi-0.2.4",
]
[[package]]
name = "iana-time-zone"
version = "0.1.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"log",
"wasm-bindgen",
"windows-core",
]
[[package]]
name = "iana-time-zone-haiku"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
"cc",
]
[[package]]
name = "instant"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
[[package]]
name = "js-sys"
version = "0.3.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
dependencies = [
"once_cell",
"wasm-bindgen",
]
[[package]]
name = "libc"
version = "0.2.172"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
[[package]]
name = "log"
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
dependencies = [
"portable-atomic",
]
[[package]]
name = "portable-atomic"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
[[package]]
name = "proc-macro2"
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
[[package]]
name = "r-efi"
version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
[[package]]
name = "rhai"
version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce4d759a4729a655ddfdbb3ff6e77fb9eadd902dae12319455557796e435d2a6"
dependencies = [
"ahash",
"bitflags",
"instant",
"num-traits",
"once_cell",
"rhai_codegen",
"smallvec",
"smartstring",
"thin-vec",
]
[[package]]
name = "rhai_codegen"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "rustversion"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
[[package]]
name = "shlex"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "smallvec"
version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
[[package]]
name = "smartstring"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
dependencies = [
"autocfg",
"static_assertions",
"version_check",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "syn"
version = "2.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thin-vec"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
[[package]]
name = "tiny-keccak"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
dependencies = [
"crunchy",
]
[[package]]
name = "unicode-ident"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi"
version = "0.14.2+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
dependencies = [
"wit-bindgen-rt",
]
[[package]]
name = "wasm-bindgen"
version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
dependencies = [
"cfg-if",
"once_cell",
"rustversion",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
dependencies = [
"bumpalo",
"log",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
dependencies = [
"unicode-ident",
]
[[package]]
name = "windows-core"
version = "0.61.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40"
dependencies = [
"windows-implement",
"windows-interface",
"windows-link",
"windows-result",
"windows-strings",
]
[[package]]
name = "windows-implement"
version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "windows-interface"
version = "0.59.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "windows-link"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
[[package]]
name = "windows-result"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
dependencies = [
"windows-link",
]
[[package]]
name = "windows-strings"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a"
dependencies = [
"windows-link",
]
[[package]]
name = "wit-bindgen-rt"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags",
]
[[package]]
name = "zerocopy"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
dependencies = [
"proc-macro2",
"quote",
"syn",
]

2
heromodels-derive/src/lib.rs
View File

@ -130,7 +130,7 @@ pub fn model(_attr: TokenStream, item: TokenStream) -> TokenStream {
} }
fn get_id(&self) -> u32 { fn get_id(&self) -> u32 {
self.base_data.id self.base_data.id.unwrap_or(0)
} }
fn base_data_mut(&mut self) -> &mut heromodels_core::BaseModelData { fn base_data_mut(&mut self) -> &mut heromodels_core::BaseModelData {

183
heromodels/examples/basic_user_example.rs
View File

@ -3,6 +3,29 @@ use heromodels::models::userexample::user::user_index::{is_active, username};
use heromodels::models::{Comment, User}; use heromodels::models::{Comment, User};
use heromodels_core::Model; use heromodels_core::Model;
// Helper function to print user details
fn print_user_details(user: &User) {
println!("\n--- User Details ---");
println!("ID: {}", user.get_id());
println!("Username: {}", user.username);
println!("Email: {}", user.email);
println!("Full Name: {}", user.full_name);
println!("Active: {}", user.is_active);
println!("Created At: {}", user.base_data.created_at);
println!("Modified At: {}", user.base_data.modified_at);
println!("Comments: {:?}", user.base_data.comments);
}
// Helper function to print comment details
fn print_comment_details(comment: &Comment) {
println!("\n--- Comment Details ---");
println!("ID: {}", comment.get_id());
println!("User ID: {}", comment.user_id);
println!("Content: {}", comment.content);
println!("Created At: {}", comment.base_data.created_at);
println!("Modified At: {}", comment.base_data.modified_at);
}
fn main() { fn main() {
// Create a new DB instance in /tmp/ourdb, and reset before every run // Create a new DB instance in /tmp/ourdb, and reset before every run
let db = heromodels::db::hero::OurDB::new("/tmp/ourdb", true).expect("Can create DB"); let db = heromodels::db::hero::OurDB::new("/tmp/ourdb", true).expect("Can create DB");
@ -10,50 +33,75 @@ fn main() {
println!("Hero Models - Basic Usage Example"); println!("Hero Models - Basic Usage Example");
println!("================================"); println!("================================");
// Create a new user using the fluent interface // Create users with different ID configurations
let user = User::new(1)
// User 1: With explicit ID
let user1 = User::new(Some(1))
.username("johndoe") .username("johndoe")
.email("john.doe@example.com") .email("john.doe@example.com")
.full_name("John Doe") .full_name("John Doe")
.is_active(false) .is_active(false)
.build(); .build();
let user2 = User::new(2)
// User 2: With auto-generated ID
let user2 = User::new(None)
.username("janesmith") .username("janesmith")
.email("jane.smith@example.com") .email("jane.smith@example.com")
.full_name("Jane Smith") .full_name("Jane Smith")
.is_active(true) .is_active(true)
.build(); .build();
let user3 = User::new(3)
// User 3: With explicit ID
let user3 = User::new(Some(3))
.username("willism") .username("willism")
.email("willis.masters@example.com") .email("willis.masters@example.com")
.full_name("Willis Masters") .full_name("Willis Masters")
.is_active(true) .is_active(true)
.build(); .build();
let user4 = User::new(4)
// User 4: With explicit ID
let user4 = User::new(Some(4))
.username("carrols") .username("carrols")
.email("carrol.smith@example.com") .email("carrol.smith@example.com")
.full_name("Carrol Smith") .full_name("Carrol Smith")
.is_active(false) .is_active(false)
.build(); .build();
db.collection() // Save all users to database
.expect("can open user collection") db.collection().expect("can open user collection").set(&user1).expect("can set user");
.set(&user) db.collection().expect("can open user collection").set(&user2).expect("can set user");
.expect("can set user"); db.collection().expect("can open user collection").set(&user3).expect("can set user");
db.collection() db.collection().expect("can open user collection").set(&user4).expect("can set user");
.expect("can open user collection")
.set(&user2)
.expect("can set user");
db.collection()
.expect("can open user collection")
.set(&user3)
.expect("can set user");
db.collection()
.expect("can open user collection")
.set(&user4)
.expect("can set user");
// Perform an indexed lookup on the Username // Retrieve all users from database
let db_user1 = db.collection::<User>().expect("can open user collection")
.get_by_id(user1.get_id()).expect("can load user").expect("user should exist");
let db_user2 = db.collection::<User>().expect("can open user collection")
.get_by_id(user2.get_id()).expect("can load user").expect("user should exist");
let db_user3 = db.collection::<User>().expect("can open user collection")
.get_by_id(user3.get_id()).expect("can load user").expect("user should exist");
let db_user4 = db.collection::<User>().expect("can open user collection")
.get_by_id(user4.get_id()).expect("can load user").expect("user should exist");
// Print all users retrieved from database
println!("\n--- Users Retrieved from Database ---");
println!("\n1. User with explicit ID (1):");
print_user_details(&db_user1);
println!("\n2. User with auto-generated ID:");
print_user_details(&db_user2);
println!("\n3. User with explicit ID (3):");
print_user_details(&db_user3);
println!("\n4. User with explicit ID (4):");
print_user_details(&db_user4);
// Demonstrate different ways to retrieve users from the database
// 1. Retrieve by username index
println!("\n--- Retrieving Users by Different Methods ---");
println!("\n1. By Username Index:");
let stored_users = db let stored_users = db
.collection::<User>() .collection::<User>()
.expect("can open user collection") .expect("can open user collection")
@ -61,72 +109,105 @@ fn main() {
.expect("can load stored user"); .expect("can load stored user");
assert_eq!(stored_users.len(), 1); assert_eq!(stored_users.len(), 1);
let stored_user = &stored_users[0]; print_user_details(&stored_users[0]);
assert_eq!(user.username, stored_user.username); // 2. Retrieve by active status
assert_eq!(user.email, stored_user.email); println!("\n2. By Active Status (Active = true):");
assert_eq!(user.is_active, stored_user.is_active);
assert_eq!(user.full_name, stored_user.full_name);
// Load all active users using the IsActive field index
// TODO: expand Index type so it defines the type of the key
let active_users = db let active_users = db
.collection::<User>() .collection::<User>()
.expect("can open user collection") .expect("can open user collection")
.get::<is_active, _>(&true) .get::<is_active, _>(&true)
.expect("can load stored users"); .expect("can load stored users");
// We should have 2 active users
assert_eq!(active_users.len(), 2);
// Now remove a user assert_eq!(active_users.len(), 2);
for (i, active_user) in active_users.iter().enumerate() {
print_user_details(active_user);
}
// 3. Delete a user and show the updated results
println!("\n3. After Deleting a User:");
db.collection::<User>() db.collection::<User>()
.expect("can open user collection") .expect("can open user collection")
.delete_by_id(active_users[0].get_id()) .delete_by_id(active_users[0].get_id())
.expect("can delete existing user"); .expect("can delete existing user");
// Load the active users again, should be 1 left // Show remaining active users
let active_users = db let active_users = db
.collection::<User>() .collection::<User>()
.expect("can open user collection") .expect("can open user collection")
.get::<is_active, _>(&true) .get::<is_active, _>(&true)
.expect("can load stored users"); .expect("can load stored users");
println!(" a. Remaining Active Users:");
assert_eq!(active_users.len(), 1); assert_eq!(active_users.len(), 1);
// And verify we still have 2 inactive users for (i, active_user) in active_users.iter().enumerate() {
print_user_details(active_user);
}
// Show inactive users
let inactive_users = db let inactive_users = db
.collection::<User>() .collection::<User>()
.expect("can open user collection") .expect("can open user collection")
.get::<is_active, _>(&false) .get::<is_active, _>(&false)
.expect("can load stored users"); .expect("can load stored users");
assert_eq!(inactive_users.len(), 2);
println!("Created user: {:?}", user); println!(" b. Inactive Users:");
println!("User ID: {}", user.get_id()); assert_eq!(inactive_users.len(), 2);
for (i, inactive_user) in inactive_users.iter().enumerate() {
print_user_details(inactive_user);
}
println!("\n--- User Model Information ---");
println!("User DB Prefix: {}", User::db_prefix()); println!("User DB Prefix: {}", User::db_prefix());
// Create a comment for the user // Demonstrate comment creation and association with a user
let comment = Comment::new(5) println!("\n--- Working with Comments ---");
.user_id(1) // commenter's user ID
// 1. Create and save a comment
println!("\n1. Creating a Comment:");
let comment = Comment::new(None)
.user_id(db_user1.get_id()) // commenter's user ID
.content("This is a comment on the user") .content("This is a comment on the user")
.build(); .build();
db.collection() db.collection()
.expect("can open commen collection") .expect("can open comment collection")
.set(&comment) .set(&comment)
.expect("can set comment"); .expect("can set comment");
let stored_comment = db // 2. Retrieve the comment from database
let db_comment = db
.collection::<Comment>() .collection::<Comment>()
.expect("can open comment collection") .expect("can open comment collection")
.get_by_id(5) .get_by_id(comment.get_id())
.expect("can load stored comment"); .expect("can load comment")
.expect("comment should exist");
assert!(stored_comment.is_some()); println!(" a. Comment Retrieved from Database:");
let stored_comment = stored_comment.unwrap(); print_comment_details(&db_comment);
assert_eq!(comment.get_id(), stored_comment.get_id()); // 3. Associate the comment with a user
assert_eq!(comment.content, stored_comment.content); println!("\n2. Associating Comment with User:");
let mut updated_user = db_user1.clone();
updated_user.base_data.add_comment(db_comment.get_id());
println!("\nCreated comment: {:?}", comment); db.collection::<User>()
println!("Comment ID: {}", comment.get_id()); .expect("can open user collection")
.set(&updated_user)
.expect("can set updated user");
// 4. Retrieve the updated user
let user_with_comment = db
.collection::<User>()
.expect("can open user collection")
.get_by_id(updated_user.get_id())
.expect("can load user")
.expect("user should exist");
println!(" a. User with Associated Comment:");
print_user_details(&user_with_comment);
println!("\n--- Model Information ---");
println!("User DB Prefix: {}", User::db_prefix());
println!("Comment DB Prefix: {}", Comment::db_prefix()); println!("Comment DB Prefix: {}", Comment::db_prefix());
} }

15
heromodels/examples/calendar_example/main.rs
View File

@ -40,7 +40,7 @@ fn main() {
.description("Brainstorming session for new project features.") .description("Brainstorming session for new project features.")
.add_attendee(attendee1.clone()) .add_attendee(attendee1.clone())
.add_attendee(attendee3.clone()); .add_attendee(attendee3.clone());
let event3_for_calendar2 = Event::new( let event3_for_calendar2 = Event::new(
"event_gamma".to_string(), "event_gamma".to_string(),
"Client Call", "Client Call",
@ -50,12 +50,15 @@ fn main() {
// --- Create Calendars --- // --- Create Calendars ---
// Note: Calendar::new directly returns Calendar, no separate .build() step like the user example. // Note: Calendar::new directly returns Calendar, no separate .build() step like the user example.
let calendar1 = Calendar::new(1, "Work Calendar")
// Create a calendar with auto-generated ID
let calendar1 = Calendar::new(None, "Work Calendar")
.description("Calendar for all work-related events.") .description("Calendar for all work-related events.")
.add_event(event1.clone()) .add_event(event1.clone())
.add_event(event2.clone()); .add_event(event2.clone());
let calendar2 = Calendar::new(2, "Personal Calendar") // Create a calendar with explicit ID
let calendar2 = Calendar::new(Some(2), "Personal Calendar")
.add_event(event3_for_calendar2.clone()); .add_event(event3_for_calendar2.clone());
@ -72,7 +75,7 @@ fn main() {
let stored_calendar1_opt = cal_collection.get_by_id(calendar1.get_id()).expect("can try to load calendar1"); let stored_calendar1_opt = cal_collection.get_by_id(calendar1.get_id()).expect("can try to load calendar1");
assert!(stored_calendar1_opt.is_some(), "Calendar1 should be found in DB"); assert!(stored_calendar1_opt.is_some(), "Calendar1 should be found in DB");
let mut stored_calendar1 = stored_calendar1_opt.unwrap(); let mut stored_calendar1 = stored_calendar1_opt.unwrap();
println!("\nRetrieved calendar1 from DB: Name - '{}', Events count: {}", stored_calendar1.name, stored_calendar1.events.len()); println!("\nRetrieved calendar1 from DB: Name - '{}', Events count: {}", stored_calendar1.name, stored_calendar1.events.len());
assert_eq!(stored_calendar1.name, "Work Calendar"); assert_eq!(stored_calendar1.name, "Work Calendar");
assert_eq!(stored_calendar1.events.len(), 2); assert_eq!(stored_calendar1.events.len(), 2);
@ -87,7 +90,7 @@ fn main() {
println!("Rescheduling event '{}'...", event_to_update.title); println!("Rescheduling event '{}'...", event_to_update.title);
event_to_update.reschedule(new_start_time, new_end_time) event_to_update.reschedule(new_start_time, new_end_time)
}); });
let rescheduled_event = stored_calendar1.events.iter().find(|e| e.id == event_id_to_reschedule) let rescheduled_event = stored_calendar1.events.iter().find(|e| e.id == event_id_to_reschedule)
.expect("Rescheduled event should exist"); .expect("Rescheduled event should exist");
assert_eq!(rescheduled_event.start_time, new_start_time); assert_eq!(rescheduled_event.start_time, new_start_time);
@ -123,7 +126,7 @@ fn main() {
println!("\nDeleted calendar2 (ID: {}) from DB.", calendar2.get_id()); println!("\nDeleted calendar2 (ID: {}) from DB.", calendar2.get_id());
println!("Calendar model DB Prefix: {}", Calendar::db_prefix()); println!("Calendar model DB Prefix: {}", Calendar::db_prefix());
println!("\nExample finished. DB stored at {}", db_path); println!("\nExample finished. DB stored at {}", db_path);
println!("To clean up, you can manually delete the directory: {}", db_path); println!("To clean up, you can manually delete the directory: {}", db_path);
} }

66
heromodels/examples/finance_example/main.rs
View File

@ -10,9 +10,9 @@ fn main() {
// --- PART 1: ACCOUNTS AND ASSETS --- // --- PART 1: ACCOUNTS AND ASSETS ---
println!("=== ACCOUNTS AND ASSETS ===\n"); println!("=== ACCOUNTS AND ASSETS ===\n");
// Create a new account // Create a new account with auto-generated ID
let mut account = Account::new( let mut account = Account::new(
1, // id None, // id (auto-generated)
"Main ETH Wallet", // name "Main ETH Wallet", // name
1001, // user_id 1001, // user_id
"My primary Ethereum wallet", // description "My primary Ethereum wallet", // description
@ -28,8 +28,9 @@ fn main() {
println!(""); println!("");
// Create some assets // Create some assets
// Asset with auto-generated ID
let eth_asset = Asset::new( let eth_asset = Asset::new(
101, // id None, // id (auto-generated)
"Ethereum", // name "Ethereum", // name
"Native ETH cryptocurrency", // description "Native ETH cryptocurrency", // description
1.5, // amount 1.5, // amount
@ -38,8 +39,9 @@ fn main() {
18, // decimals 18, // decimals
); );
// Assets with explicit IDs
let usdc_asset = Asset::new( let usdc_asset = Asset::new(
102, // id Some(102), // id
"USDC", // name "USDC", // name
"USD Stablecoin on Ethereum", // description "USD Stablecoin on Ethereum", // description
1000.0, // amount 1000.0, // amount
@ -49,7 +51,7 @@ fn main() {
); );
let nft_asset = Asset::new( let nft_asset = Asset::new(
103, // id Some(103), // id
"CryptoPunk #1234", // name "CryptoPunk #1234", // name
"Rare digital collectible", // description "Rare digital collectible", // description
1.0, // amount 1.0, // amount
@ -95,9 +97,9 @@ fn main() {
// --- PART 2: MARKETPLACE LISTINGS --- // --- PART 2: MARKETPLACE LISTINGS ---
println!("\n=== MARKETPLACE LISTINGS ===\n"); println!("\n=== MARKETPLACE LISTINGS ===\n");
// Create a fixed price listing // Create a fixed price listing with auto-generated ID
let mut fixed_price_listing = Listing::new( let mut fixed_price_listing = Listing::new(
201, // id None, // id (auto-generated)
"1000 USDC for Sale", // title "1000 USDC for Sale", // title
"Selling 1000 USDC tokens at fixed price", // description "Selling 1000 USDC tokens at fixed price", // description
"102", // asset_id (referencing the USDC asset) "102", // asset_id (referencing the USDC asset)
@ -131,9 +133,9 @@ fn main() {
Err(e) => println!("Error completing sale: {}", e), Err(e) => println!("Error completing sale: {}", e),
} }
// Create an auction listing for the NFT // Create an auction listing for the NFT with explicit ID
let mut auction_listing = Listing::new( let mut auction_listing = Listing::new(
202, // id Some(202), // id (explicit)
"CryptoPunk #1234 Auction", // title "CryptoPunk #1234 Auction", // title
"Rare CryptoPunk NFT for auction", // description "Rare CryptoPunk NFT for auction", // description
"103", // asset_id (referencing the NFT asset) "103", // asset_id (referencing the NFT asset)
@ -176,7 +178,7 @@ fn main() {
// Add bids to the auction // Add bids to the auction
println!("Adding Bids to Auction:"); println!("Adding Bids to Auction:");
// Using clone() to avoid ownership issues with match expressions // Using clone() to avoid ownership issues with match expressions
match auction_listing.clone().add_bid(bid1) { match auction_listing.clone().add_bid(bid1) {
Ok(updated_listing) => { Ok(updated_listing) => {
@ -185,7 +187,7 @@ fn main() {
}, },
Err(e) => println!("Error adding bid: {}", e), Err(e) => println!("Error adding bid: {}", e),
} }
match auction_listing.clone().add_bid(bid2) { match auction_listing.clone().add_bid(bid2) {
Ok(updated_listing) => { Ok(updated_listing) => {
auction_listing = updated_listing; auction_listing = updated_listing;
@ -193,7 +195,7 @@ fn main() {
}, },
Err(e) => println!("Error adding bid: {}", e), Err(e) => println!("Error adding bid: {}", e),
} }
match auction_listing.clone().add_bid(bid3) { match auction_listing.clone().add_bid(bid3) {
Ok(updated_listing) => { Ok(updated_listing) => {
auction_listing = updated_listing; auction_listing = updated_listing;
@ -204,14 +206,14 @@ fn main() {
println!("\nCurrent Auction Status:"); println!("\nCurrent Auction Status:");
println!("Current Price: {} {}", auction_listing.price, auction_listing.currency); println!("Current Price: {} {}", auction_listing.price, auction_listing.currency);
if let Some(highest_bid) = auction_listing.highest_bid() { if let Some(highest_bid) = auction_listing.highest_bid() {
println!("Highest Bid: {} {} from User {}", println!("Highest Bid: {} {} from User {}",
highest_bid.amount, highest_bid.amount,
highest_bid.currency, highest_bid.currency,
highest_bid.bidder_id); highest_bid.bidder_id);
} }
println!("Total Bids: {}", auction_listing.bids.len()); println!("Total Bids: {}", auction_listing.bids.len());
println!(""); println!("");
@ -224,13 +226,13 @@ fn main() {
println!("Winner: User {}", auction_listing.buyer_id.as_ref().unwrap()); println!("Winner: User {}", auction_listing.buyer_id.as_ref().unwrap());
println!("Winning Bid: {} {}", auction_listing.sale_price.as_ref().unwrap(), auction_listing.currency); println!("Winning Bid: {} {}", auction_listing.sale_price.as_ref().unwrap(), auction_listing.currency);
println!(""); println!("");
println!("Final Bid Statuses:"); println!("Final Bid Statuses:");
for bid in &auction_listing.bids { for bid in &auction_listing.bids {
println!("- User {}: {} {} (Status: {:?})", println!("- User {}: {} {} (Status: {:?})",
bid.bidder_id, bid.bidder_id,
bid.amount, bid.amount,
bid.currency, bid.currency,
bid.status); bid.status);
} }
println!(""); println!("");
@ -238,9 +240,9 @@ fn main() {
Err(e) => println!("Error completing auction: {}", e), Err(e) => println!("Error completing auction: {}", e),
} }
// Create an exchange listing // Create an exchange listing with auto-generated ID
let exchange_listing = Listing::new( let exchange_listing = Listing::new(
203, // id None, // id (auto-generated)
"ETH for BTC Exchange", // title "ETH for BTC Exchange", // title
"Looking to exchange ETH for BTC", // description "Looking to exchange ETH for BTC", // description
"101", // asset_id (referencing the ETH asset) "101", // asset_id (referencing the ETH asset)
@ -262,9 +264,9 @@ fn main() {
// --- PART 3: DEMONSTRATING EDGE CASES --- // --- PART 3: DEMONSTRATING EDGE CASES ---
println!("\n=== EDGE CASES AND VALIDATIONS ===\n"); println!("\n=== EDGE CASES AND VALIDATIONS ===\n");
// Create a new auction listing for edge case testing // Create a new auction listing for edge case testing with explicit ID
let test_auction = Listing::new( let test_auction = Listing::new(
205, // id Some(205), // id (explicit)
"Test Auction", // title "Test Auction", // title
"For testing edge cases", // description "For testing edge cases", // description
"101", // asset_id "101", // asset_id
@ -277,7 +279,7 @@ fn main() {
vec![], // tags vec![], // tags
None::<String>, // image_url None::<String>, // image_url
); );
// Try to add a bid that's too low // Try to add a bid that's too low
let low_bid = Bid::new( let low_bid = Bid::new(
test_auction.base_data.id.to_string(), // listing_id test_auction.base_data.id.to_string(), // listing_id
@ -285,7 +287,7 @@ fn main() {
5.0, // amount (lower than starting price) 5.0, // amount (lower than starting price)
"ETH", // currency "ETH", // currency
); );
println!("Attempting to add a bid that's too low (5.0 ETH):"); println!("Attempting to add a bid that's too low (5.0 ETH):");
match test_auction.add_bid(low_bid) { match test_auction.add_bid(low_bid) {
Ok(_) => println!("Bid accepted (This shouldn't happen)"), Ok(_) => println!("Bid accepted (This shouldn't happen)"),
@ -301,9 +303,9 @@ fn main() {
} }
println!(""); println!("");
// Create a listing that will expire // Create a listing that will expire with auto-generated ID
let mut expiring_listing = Listing::new( let mut expiring_listing = Listing::new(
204, // id None, // id (auto-generated)
"About to Expire", // title "About to Expire", // title
"This listing will expire immediately", // description "This listing will expire immediately", // description
"101", // asset_id "101", // asset_id
@ -316,10 +318,10 @@ fn main() {
vec![], // tags vec![], // tags
None::<String>, // image_url None::<String>, // image_url
); );
println!("Created Expiring Listing: '{}' (ID: {})", expiring_listing.title, expiring_listing.base_data.id); println!("Created Expiring Listing: '{}' (ID: {})", expiring_listing.title, expiring_listing.base_data.id);
println!("Initial Status: {:?}", expiring_listing.status); println!("Initial Status: {:?}", expiring_listing.status);
// Check expiration // Check expiration
expiring_listing = expiring_listing.check_expiration(); expiring_listing = expiring_listing.check_expiration();
println!("After Checking Expiration: {:?}", expiring_listing.status); println!("After Checking Expiration: {:?}", expiring_listing.status);

50
heromodels/examples/governance_proposal_example/main.rs
View File

@ -6,9 +6,9 @@ use heromodels::models::governance::{Proposal, ProposalStatus, VoteEventStatus};
fn main() { fn main() {
println!("Governance Proposal Model Example\n"); println!("Governance Proposal Model Example\n");
// Create a new proposal // Create a new proposal with auto-generated ID
let mut proposal = Proposal::new( let mut proposal = Proposal::new(
1, // id None, // id (auto-generated)
"user_creator_123", // creator_id "user_creator_123", // creator_id
"Community Fund Allocation for Q3", // title "Community Fund Allocation for Q3", // title
"Proposal to allocate funds for community projects in the third quarter.", // description "Proposal to allocate funds for community projects in the third quarter.", // description
@ -33,18 +33,18 @@ fn main() {
// Simulate casting votes // Simulate casting votes
println!("Simulating Votes..."); println!("Simulating Votes...");
// User 1 votes for 'Approve Allocation' with 100 shares // User 1 votes for 'Approve Allocation' with 100 shares (with explicit ballot ID)
proposal = proposal.cast_vote(101, 1, 1, 100); proposal = proposal.cast_vote(Some(101), 1, 1, 100);
// User 2 votes for 'Reject Allocation' with 50 shares // User 2 votes for 'Reject Allocation' with 50 shares (with explicit ballot ID)
proposal = proposal.cast_vote(102, 2, 2, 50); proposal = proposal.cast_vote(Some(102), 2, 2, 50);
// User 3 votes for 'Approve Allocation' with 75 shares // User 3 votes for 'Approve Allocation' with 75 shares (with auto-generated ballot ID)
proposal = proposal.cast_vote(103, 3, 1, 75); proposal = proposal.cast_vote(None, 3, 1, 75);
// User 4 abstains with 20 shares // User 4 abstains with 20 shares (with auto-generated ballot ID)
proposal = proposal.cast_vote(104, 4, 3, 20); proposal = proposal.cast_vote(None, 4, 3, 20);
// User 5 attempts to vote for a non-existent option (should be handled gracefully) // User 5 attempts to vote for a non-existent option (should be handled gracefully)
proposal = proposal.cast_vote(105, 5, 99, 10); proposal = proposal.cast_vote(Some(105), 5, 99, 10);
// User 1 tries to vote again (not explicitly prevented by current model, but could be a future enhancement) // User 1 tries to vote again (not explicitly prevented by current model, but could be a future enhancement)
// proposal = proposal.cast_vote(106, 1, 1, 10); // proposal = proposal.cast_vote(Some(106), 1, 1, 10);
println!("\nVote Counts After Simulation:"); println!("\nVote Counts After Simulation:");
for option in &proposal.options { for option in &proposal.options {
@ -53,7 +53,7 @@ fn main() {
println!("\nBallots Cast:"); println!("\nBallots Cast:");
for ballot in &proposal.ballots { for ballot in &proposal.ballots {
println!("- Ballot ID: {}, User ID: {}, Option ID: {}, Shares: {}", println!("- Ballot ID: {}, User ID: {}, Option ID: {}, Shares: {}",
ballot.base_data.id, ballot.user_id, ballot.vote_option_id, ballot.shares_count); ballot.base_data.id, ballot.user_id, ballot.vote_option_id, ballot.shares_count);
} }
println!(""); println!("");
@ -68,7 +68,7 @@ fn main() {
// Attempt to cast a vote after closing (should be handled) // Attempt to cast a vote after closing (should be handled)
println!("\nAttempting to cast vote after voting is closed..."); println!("\nAttempting to cast vote after voting is closed...");
proposal = proposal.cast_vote(107, 6, 1, 25); proposal = proposal.cast_vote(None, 6, 1, 25);
// Final proposal state // Final proposal state
println!("\nFinal Proposal State:"); println!("\nFinal Proposal State:");
@ -83,24 +83,24 @@ fn main() {
// Example of a private proposal (not fully implemented in cast_vote eligibility yet) // Example of a private proposal (not fully implemented in cast_vote eligibility yet)
let mut private_proposal = Proposal::new( let mut private_proposal = Proposal::new(
2, Some(2), // explicit ID
"user_admin_001", "user_admin_001",
"Internal Team Restructure Vote", "Internal Team Restructure Vote",
"Vote on proposed internal team changes.", "Vote on proposed internal team changes.",
Utc::now(), Utc::now(),
Utc::now() + Duration::days(7) Utc::now() + Duration::days(7)
); );
private_proposal.private_group = Some(vec![10, 20, 30]); // Only users 10, 20, 30 can vote private_proposal.private_group = Some(vec![10, 20, 30]); // Only users 10, 20, 30 can vote
private_proposal = private_proposal.add_option(1, "Accept Restructure"); private_proposal = private_proposal.add_option(1, "Accept Restructure");
private_proposal = private_proposal.add_option(2, "Reject Restructure"); private_proposal = private_proposal.add_option(2, "Reject Restructure");
println!("\nCreated Private Proposal: '{}'", private_proposal.title); println!("\nCreated Private Proposal: '{}'", private_proposal.title);
println!("Eligible Voters (Group): {:?}", private_proposal.private_group); println!("Eligible Voters (Group): {:?}", private_proposal.private_group);
// User 10 (eligible) votes // User 10 (eligible) votes with explicit ballot ID
private_proposal = private_proposal.cast_vote(201, 10, 1, 100); private_proposal = private_proposal.cast_vote(Some(201), 10, 1, 100);
// User 40 (ineligible) tries to vote // User 40 (ineligible) tries to vote with auto-generated ballot ID
private_proposal = private_proposal.cast_vote(202, 40, 1, 50); private_proposal = private_proposal.cast_vote(None, 40, 1, 50);
println!("Private Proposal Vote Counts:"); println!("Private Proposal Vote Counts:");
for option in &private_proposal.options { for option in &private_proposal.options {
println!(" - {}: {} (Votes: {})", option.id, option.text, option.count); println!(" - {}: {} (Votes: {})", option.id, option.text, option.count);

6
heromodels/src/models/calendar/calendar.rs
View File

@ -140,7 +140,11 @@ pub struct Calendar {
impl Calendar { impl Calendar {
/// Creates a new calendar /// Creates a new calendar
pub fn new(id: u32, name: impl ToString) -> Self { ///
/// # Arguments
/// * `id` - Optional ID for the calendar. If None, the ID will be auto-generated.
/// * `name` - Name of the calendar
pub fn new(id: Option<u32>, name: impl ToString) -> Self {
Self { Self {
base_data: BaseModelData::new(id), base_data: BaseModelData::new(id),
name: name.to_string(), name: name.to_string(),

5
heromodels/src/models/core/comment.rs
View File

@ -14,7 +14,10 @@ pub struct Comment {
impl Comment { impl Comment {
/// Create a new comment /// Create a new comment
pub fn new(id: u32) -> Self { ///
/// # Arguments
/// * `id` - Optional ID for the comment. If None, the ID will be auto-generated.
pub fn new(id: Option<u32>) -> Self {
Self { Self {
base_data: BaseModelData::new(id), base_data: BaseModelData::new(id),
user_id: 0, user_id: 0,

21
heromodels/src/models/finance/account.rs
View File

@ -22,13 +22,22 @@ pub struct Account {
impl Account { impl Account {
/// Create a new account /// Create a new account
///
/// # Arguments
/// * `id` - Optional ID for the account. If None, the ID will be auto-generated.
/// * `name` - Name of the account
/// * `user_id` - ID of the user who owns the account
/// * `description` - Description of the account
/// * `ledger` - Ledger/blockchain where the account is located
/// * `address` - Address of the account on the blockchain
/// * `pubkey` - Public key
pub fn new( pub fn new(
id: u32, id: Option<u32>,
name: impl ToString, name: impl ToString,
user_id: u32, user_id: u32,
description: impl ToString, description: impl ToString,
ledger: impl ToString, ledger: impl ToString,
address: impl ToString, address: impl ToString,
pubkey: impl ToString pubkey: impl ToString
) -> Self { ) -> Self {
Self { Self {

2
heromodels/src/models/finance/asset.rs
View File

@ -35,7 +35,7 @@ pub struct Asset {
impl Asset { impl Asset {
/// Create a new asset /// Create a new asset
pub fn new( pub fn new(
id: u32, id: Option<u32>,
name: impl ToString, name: impl ToString,
description: impl ToString, description: impl ToString,
amount: f64, amount: f64,

2
heromodels/src/models/finance/marketplace.rs
View File

@ -113,7 +113,7 @@ pub struct Listing {
impl Listing { impl Listing {
/// Create a new listing /// Create a new listing
pub fn new( pub fn new(
id: u32, id: Option<u32>,
title: impl ToString, title: impl ToString,
description: impl ToString, description: impl ToString,
asset_id: impl ToString, asset_id: impl ToString,

24
heromodels/src/models/governance/proposal.rs
View File

@ -75,7 +75,14 @@ pub struct Ballot {
} }
impl Ballot { impl Ballot {
pub fn new(id: u32, user_id: u32, vote_option_id: u8, shares_count: i64) -> Self { /// Create a new ballot
///
/// # Arguments
/// * `id` - Optional ID for the ballot. If None, the ID will be auto-generated.
/// * `user_id` - ID of the user who cast this ballot
/// * `vote_option_id` - ID of the vote option chosen
/// * `shares_count` - Number of shares/tokens/voting power
pub fn new(id: Option<u32>, user_id: u32, vote_option_id: u8, shares_count: i64) -> Self {
Self { Self {
base_data: BaseModelData::new(id), base_data: BaseModelData::new(id),
user_id, user_id,
@ -107,7 +114,16 @@ pub struct Proposal {
} }
impl Proposal { impl Proposal {
pub fn new(id: u32, creator_id: impl ToString, title: impl ToString, description: impl ToString, vote_start_date: DateTime<Utc>, vote_end_date: DateTime<Utc>) -> Self { /// Create a new proposal
///
/// # Arguments
/// * `id` - Optional ID for the proposal. If None, the ID will be auto-generated.
/// * `creator_id` - ID of the user who created the proposal
/// * `title` - Title of the proposal
/// * `description` - Description of the proposal
/// * `vote_start_date` - Date when voting starts
/// * `vote_end_date` - Date when voting ends
pub fn new(id: Option<u32>, creator_id: impl ToString, title: impl ToString, description: impl ToString, vote_start_date: DateTime<Utc>, vote_end_date: DateTime<Utc>) -> Self {
Self { Self {
base_data: BaseModelData::new(id), base_data: BaseModelData::new(id),
creator_id: creator_id.to_string(), creator_id: creator_id.to_string(),
@ -128,8 +144,8 @@ impl Proposal {
self.options.push(new_option); self.options.push(new_option);
self self
} }
pub fn cast_vote(mut self, ballot_id: u32, user_id: u32, chosen_option_id: u8, shares: i64) -> Self { pub fn cast_vote(mut self, ballot_id: Option<u32>, user_id: u32, chosen_option_id: u8, shares: i64) -> Self {
if self.vote_status != VoteEventStatus::Open { if self.vote_status != VoteEventStatus::Open {
eprintln!("Voting is not open for proposal '{}'", self.title); eprintln!("Voting is not open for proposal '{}'", self.title);
return self; return self;

5
heromodels/src/models/userexample/user.rs
View File

@ -27,7 +27,10 @@ pub struct User {
impl User { impl User {
/// Create a new user /// Create a new user
pub fn new(id: u32) -> Self { ///
/// # Arguments
/// * `id` - Optional ID for the user. If None, the ID will be auto-generated.
pub fn new(id: Option<u32>) -> Self {
Self { Self {
base_data: BaseModelData::new(id), base_data: BaseModelData::new(id),
username: String::new(), username: String::new(),

13
heromodels_core/src/lib.rs
View File

@ -59,13 +59,14 @@ pub trait Model:
} }
/// Get the unique ID for this model /// Get the unique ID for this model
/// Returns 0 if the ID is None
fn get_id(&self) -> u32; fn get_id(&self) -> u32;
/// Get a mutable reference to the base_data field /// Get a mutable reference to the base_data field
fn base_data_mut(&mut self) -> &mut BaseModelData; fn base_data_mut(&mut self) -> &mut BaseModelData;
/// Set the ID for this model /// Set the ID for this model
fn id(mut self, id: u32) -> Self fn id(mut self, id: Option<u32>) -> Self
where where
Self: Sized, Self: Sized,
{ {
@ -98,7 +99,7 @@ pub trait Index {
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BaseModelData { pub struct BaseModelData {
/// Unique incremental ID per circle /// Unique incremental ID per circle
pub id: u32, pub id: Option<u32>,
/// Unix epoch timestamp for creation time /// Unix epoch timestamp for creation time
pub created_at: i64, pub created_at: i64,
@ -112,7 +113,7 @@ pub struct BaseModelData {
impl BaseModelData { impl BaseModelData {
/// Create a new BaseModelData instance /// Create a new BaseModelData instance
pub fn new(id: u32) -> Self { pub fn new(id: Option<u32>) -> Self {
let now = chrono::Utc::now().timestamp(); let now = chrono::Utc::now().timestamp();
Self { Self {
id, id,
@ -123,7 +124,7 @@ impl BaseModelData {
} }
/// Create a new BaseModelDataBuilder /// Create a new BaseModelDataBuilder
pub fn builder(id: u32) -> BaseModelDataBuilder { pub fn builder(id: Option<u32>) -> BaseModelDataBuilder {
BaseModelDataBuilder::new(id) BaseModelDataBuilder::new(id)
} }
@ -147,7 +148,7 @@ impl BaseModelData {
/// Builder for BaseModelData /// Builder for BaseModelData
pub struct BaseModelDataBuilder { pub struct BaseModelDataBuilder {
id: u32, id: Option<u32>,
created_at: Option<i64>, created_at: Option<i64>,
modified_at: Option<i64>, modified_at: Option<i64>,
comments: Vec<u32>, comments: Vec<u32>,
@ -155,7 +156,7 @@ pub struct BaseModelDataBuilder {
impl BaseModelDataBuilder { impl BaseModelDataBuilder {
/// Create a new BaseModelDataBuilder /// Create a new BaseModelDataBuilder
pub fn new(id: u32) -> Self { pub fn new(id: Option<u32>) -> Self {
Self { Self {
id, id,
created_at: None, created_at: None,

290
rhai_client_macros/Cargo.lock generated Normal file
View File

@ -0,0 +1,290 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 4
[[package]]
name = "ahash"
version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
"const-random",
"getrandom 0.3.3",
"once_cell",
"version_check",
"zerocopy",
]
[[package]]
name = "autocfg"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "const-random"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
dependencies = [
"const-random-macro",
]
[[package]]
name = "const-random-macro"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
dependencies = [
"getrandom 0.2.16",
"once_cell",
"tiny-keccak",
]
[[package]]
name = "crunchy"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
[[package]]
name = "getrandom"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "getrandom"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasi 0.14.2+wasi-0.2.4",
]
[[package]]
name = "instant"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
[[package]]
name = "libc"
version = "0.2.172"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
dependencies = [
"portable-atomic",
]
[[package]]
name = "portable-atomic"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
[[package]]
name = "proc-macro2"
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
[[package]]
name = "r-efi"
version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
[[package]]
name = "rhai"
version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce4d759a4729a655ddfdbb3ff6e77fb9eadd902dae12319455557796e435d2a6"
dependencies = [
"ahash",
"bitflags",
"instant",
"num-traits",
"once_cell",
"rhai_codegen",
"smallvec",
"smartstring",
"thin-vec",
]
[[package]]
name = "rhai_client_macros"
version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
"rhai",
"syn",
]
[[package]]
name = "rhai_codegen"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "smallvec"
version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
[[package]]
name = "smartstring"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
dependencies = [
"autocfg",
"static_assertions",
"version_check",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "syn"
version = "2.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thin-vec"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
[[package]]
name = "tiny-keccak"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
dependencies = [
"crunchy",
]
[[package]]
name = "unicode-ident"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi"
version = "0.14.2+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
dependencies = [
"wit-bindgen-rt",
]
[[package]]
name = "wit-bindgen-rt"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags",
]
[[package]]
name = "zerocopy"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
dependencies = [
"proc-macro2",
"quote",
"syn",
]