update to follow rhailib

heromodels/src/models/access/access.rs

@@ -1,3 +1,6 @@
+use std::sync::Arc;
+
+use crate::db::{hero::OurDB, Collection, Db};
 use heromodels_core::BaseModelData;
 use heromodels_derive::model;
 // Temporarily removed to fix compilation issues
@@ -7,14 +10,19 @@ use serde::{Deserialize, Serialize};
 
 /// Represents an event in a contact
 #[model]
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, CustomType)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, CustomType, Default)]
 pub struct Access {
     /// Base model data
     pub base_data: BaseModelData,
     #[index]
+    pub object_type: String,
+    #[index]
     pub object_id: u32,
-    pub circle_id: u32,
+    #[index]
+    pub circle_pk: String,
+    #[index]
     pub contact_id: u32,
+    #[index]
     pub group_id: u32,
     pub expires_at: Option<u64>,
 }
@@ -24,13 +32,19 @@ impl Access {
         Access {
             base_data: BaseModelData::new(),
             object_id: 0,
-            circle_id: 0,
+            object_type: String::new(),
+            circle_pk: String::new(),
             contact_id: 0,
             group_id: 0,
             expires_at: None,
         }
     }
 
+    pub fn object_type(mut self, object_type: String) -> Self {
+        self.object_type = object_type;
+        self
+    }
+
     pub fn object_id(mut self, object_id: u32) -> Self {
         self.object_id = object_id;
         self
@@ -46,8 +60,8 @@ impl Access {
         self
     }
 
-    pub fn circle_id(mut self, circle_id: u32) -> Self {
-        self.circle_id = circle_id;
+    pub fn circle_pk(mut self, circle_pk: String) -> Self {
+        self.circle_pk = circle_pk;
         self
     }
 
@@ -56,3 +70,46 @@ impl Access {
         self
     }
 }
+
+
+/// Checks if a caller has permission to access a specific resource.
+/// Access is granted if the caller is a super admin or if an `Access` record exists
+/// granting them `can_access = true` for the given resource type and ID.
+/// 
+/// # Arguments
+/// * `db`: An `Arc<OurDB>` for database interaction.
+/// * `public_key`: The public key of the caller.
+/// * `_resource_id_to_check`: The ID of the resource being accessed (now unused).
+/// * `_resource_type_to_check`: The type of the resource (e.g., "Collection", "Image") (now unused).
+/// 
+/// # Errors
+/// Returns `Err(EvalAltResult::ErrorRuntime)` if there's a database error during the check.
+pub fn can_access_resource(
+    db: Arc<OurDB>,
+    public_key: &str,
+    _resource_id_to_check: u32,
+    _resource_type_to_check: &str,
+) -> bool {
+    // Query for Access records matching the public key.
+    // Note: This fetches all access records for the user. For performance with many records,
+    // consider a more specific query if your DB supports it, or caching.
+    let access_records = match db
+        .collection::<Access>()
+        .expect("Failed to get Access collection")
+        .get::<access_index::circle_pk, _>(public_key)
+    {
+        Ok(records) => records,
+        Err(_e) => {
+            // Optionally log the error for debugging purposes.
+            // For example: log::warn!("Error fetching access records for public key {}: {:?}", public_key, e);
+            // If database query fails, assume access is not granted.
+            return false;
+        }
+    };
+
+    if !access_records.is_empty() {
+        return true;
+    }
+
+    false // Default to deny if no grant is found
+}

heromodels/src/models/access/rhai.rs

@@ -43,17 +43,17 @@ mod rhai_access_module {
         Ok(access.clone())
     }
 
-    #[rhai_fn(name = "circle_id", return_raw, global, pure)]
-    pub fn access_circle_id(
+    #[rhai_fn(name = "circle_pk", return_raw, global, pure)]
+    pub fn access_circle_pk(
         access: &mut RhaiAccess,
-        circle_id: u32,
+        circle_pk: String,
     ) -> Result<RhaiAccess, Box<EvalAltResult>> {
         // Create a default Access to replace the taken one
         let default_access = Access::new();
 
         // Take ownership of the access, apply the builder method, then put it back
         let owned_access = std::mem::replace(access, default_access);
-        *access = owned_access.circle_id(circle_id);
+        *access = owned_access.circle_pk(circle_pk);
         Ok(access.clone())
     }
 
@@ -110,9 +110,9 @@ mod rhai_access_module {
         access.object_id as i64
     }
 
-    #[rhai_fn(get = "circle_id", pure)]
-    pub fn get_access_circle_id(access: &mut RhaiAccess) -> i64 {
-        access.circle_id as i64
+    #[rhai_fn(get = "circle_pk", pure)]
+    pub fn get_access_circle_pk(access: &mut RhaiAccess) -> String {
+        access.circle_pk.clone()
     }
 
     #[rhai_fn(get = "group_id", pure)]

heromodels/src/models/gov/committee.rs

@@ -0,0 +1,169 @@
+use heromodels_core::{Model, BaseModelData, IndexKey};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+/// CommitteeRole represents the role of a committee member
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum CommitteeRole {
+    Chair,
+    ViceChair,
+    Secretary,
+    Treasurer,
+    Member,
+    Observer,
+    Advisor,
+}
+
+/// CommitteeMember represents a member of a committee
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CommitteeMember {
+    pub id: u32,
+    pub user_id: u32,
+    pub name: String,
+    pub role: CommitteeRole,
+    pub joined_date: DateTime<Utc>,
+    pub notes: String,
+}
+
+impl CommitteeMember {
+    /// Create a new committee member
+    pub fn new() -> Self {
+        Self {
+            id: 0,
+            user_id: 0,
+            name: String::new(),
+            role: CommitteeRole::Member,
+            joined_date: Utc::now(),
+            notes: String::new(),
+        }
+    }
+    
+    /// Set the ID
+    pub fn id(mut self, id: u32) -> Self {
+        self.id = id;
+        self
+    }
+    
+    /// Set the user ID
+    pub fn user_id(mut self, user_id: u32) -> Self {
+        self.user_id = user_id;
+        self
+    }
+    
+    /// Set the name
+    pub fn name(mut self, name: impl ToString) -> Self {
+        self.name = name.to_string();
+        self
+    }
+    
+    /// Set the role
+    pub fn role(mut self, role: CommitteeRole) -> Self {
+        self.role = role;
+        self
+    }
+    
+    /// Set the joined date
+    pub fn joined_date(mut self, joined_date: DateTime<Utc>) -> Self {
+        self.joined_date = joined_date;
+        self
+    }
+    
+    /// Set the notes
+    pub fn notes(mut self, notes: impl ToString) -> Self {
+        self.notes = notes.to_string();
+        self
+    }
+    
+    /// Build the committee member
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+/// Committee represents a committee in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct Committee {
+    pub base_data: BaseModelData,
+    pub company_id: u32,
+    pub name: String,
+    pub description: String,
+    pub created_date: DateTime<Utc>,
+    pub members: Vec<CommitteeMember>,
+}
+
+impl Committee {
+    /// Create a new committee
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            company_id: 0,
+            name: String::new(),
+            description: String::new(),
+            created_date: Utc::now(),
+            members: Vec::new(),
+        }
+    }
+    
+    /// Set the company ID
+    pub fn company_id(mut self, company_id: u32) -> Self {
+        self.company_id = company_id;
+        self
+    }
+    
+    /// Set the name
+    pub fn name(mut self, name: impl ToString) -> Self {
+        self.name = name.to_string();
+        self
+    }
+    
+    /// Set the description
+    pub fn description(mut self, description: impl ToString) -> Self {
+        self.description = description.to_string();
+        self
+    }
+    
+    /// Set the created date
+    pub fn created_date(mut self, created_date: DateTime<Utc>) -> Self {
+        self.created_date = created_date;
+        self
+    }
+    
+    /// Add a member
+    pub fn add_member(mut self, member: CommitteeMember) -> Self {
+        self.members.push(member);
+        self
+    }
+    
+    /// Build the committee
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for Committee {
+    fn db_prefix() -> &'static str {
+        "committee"
+    }
+    
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+    
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+    
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "company_id",
+                value: self.company_id.to_string(),
+            },
+            IndexKey {
+                name: "name",
+                value: self.name.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/gov/company.rs

@@ -0,0 +1,191 @@
+use heromodels_core::{Model, BaseModelData, IndexKey};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+/// CompanyStatus represents the status of a company
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum CompanyStatus {
+    Active,
+    Inactive,
+    Dissolved,
+    Suspended,
+    Pending,
+}
+
+/// BusinessType represents the type of a business
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BusinessType {
+    pub type_name: String,
+    pub description: String,
+}
+
+impl BusinessType {
+    /// Create a new business type
+    pub fn new() -> Self {
+        Self {
+            type_name: String::new(),
+            description: String::new(),
+        }
+    }
+    
+    /// Set the type name
+    pub fn type_name(mut self, type_name: impl ToString) -> Self {
+        self.type_name = type_name.to_string();
+        self
+    }
+    
+    /// Set the description
+    pub fn description(mut self, description: impl ToString) -> Self {
+        self.description = description.to_string();
+        self
+    }
+    
+    /// Build the business type
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+/// Company represents a company in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct Company {
+    pub base_data: BaseModelData,
+    pub name: String,
+    pub registration_number: String,
+    pub incorporation_date: DateTime<Utc>,
+    pub fiscal_year_end: String,
+    pub email: String,
+    pub phone: String,
+    pub website: String,
+    pub address: String,
+    pub business_type: BusinessType,
+    pub industry: String,
+    pub description: String,
+    pub status: CompanyStatus,
+}
+
+impl Company {
+    /// Create a new company
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            name: String::new(),
+            registration_number: String::new(),
+            incorporation_date: Utc::now(),
+            fiscal_year_end: String::new(),
+            email: String::new(),
+            phone: String::new(),
+            website: String::new(),
+            address: String::new(),
+            business_type: BusinessType::new(),
+            industry: String::new(),
+            description: String::new(),
+            status: CompanyStatus::Pending,
+        }
+    }
+    
+    /// Set the name
+    pub fn name(mut self, name: impl ToString) -> Self {
+        self.name = name.to_string();
+        self
+    }
+    
+    /// Set the registration number
+    pub fn registration_number(mut self, registration_number: impl ToString) -> Self {
+        self.registration_number = registration_number.to_string();
+        self
+    }
+    
+    /// Set the incorporation date
+    pub fn incorporation_date(mut self, incorporation_date: DateTime<Utc>) -> Self {
+        self.incorporation_date = incorporation_date;
+        self
+    }
+    
+    /// Set the fiscal year end
+    pub fn fiscal_year_end(mut self, fiscal_year_end: impl ToString) -> Self {
+        self.fiscal_year_end = fiscal_year_end.to_string();
+        self
+    }
+    
+    /// Set the email
+    pub fn email(mut self, email: impl ToString) -> Self {
+        self.email = email.to_string();
+        self
+    }
+    
+    /// Set the phone
+    pub fn phone(mut self, phone: impl ToString) -> Self {
+        self.phone = phone.to_string();
+        self
+    }
+    
+    /// Set the website
+    pub fn website(mut self, website: impl ToString) -> Self {
+        self.website = website.to_string();
+        self
+    }
+    
+    /// Set the address
+    pub fn address(mut self, address: impl ToString) -> Self {
+        self.address = address.to_string();
+        self
+    }
+    
+    /// Set the business type
+    pub fn business_type(mut self, business_type: BusinessType) -> Self {
+        self.business_type = business_type;
+        self
+    }
+    
+    /// Set the industry
+    pub fn industry(mut self, industry: impl ToString) -> Self {
+        self.industry = industry.to_string();
+        self
+    }
+    
+    /// Set the description
+    pub fn description(mut self, description: impl ToString) -> Self {
+        self.description = description.to_string();
+        self
+    }
+    
+    /// Set the status
+    pub fn status(mut self, status: CompanyStatus) -> Self {
+        self.status = status;
+        self
+    }
+    
+    /// Build the company
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for Company {
+    fn db_prefix() -> &'static str {
+        "company"
+    }
+    
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+    
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+    
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "name",
+                value: self.name.clone(),
+            },
+            IndexKey {
+                name: "registration_number",
+                value: self.registration_number.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/gov/meeting.rs

@@ -0,0 +1,227 @@
+use heromodels_core::{Model, BaseModelData, IndexKey};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+/// MeetingStatus represents the status of a meeting
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum MeetingStatus {
+    Scheduled,
+    InProgress,
+    Completed,
+    Cancelled,
+}
+
+/// MeetingType represents the type of a meeting
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum MeetingType {
+    BoardMeeting,
+    CommitteeMeeting,
+    GeneralAssembly,
+    AnnualGeneralMeeting,
+    ExtraordinaryGeneralMeeting,
+    Other,
+}
+
+/// AttendanceStatus represents the status of an attendee
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum AttendanceStatus {
+    Invited,
+    Confirmed,
+    Declined,
+    Attended,
+    Absent,
+}
+
+/// Attendee represents an attendee of a meeting
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Attendee {
+    pub user_id: u32,
+    pub name: String,
+    pub role: String,
+    pub status: AttendanceStatus,
+    pub notes: String,
+}
+
+impl Attendee {
+    /// Create a new attendee
+    pub fn new() -> Self {
+        Self {
+            user_id: 0,
+            name: String::new(),
+            role: String::new(),
+            status: AttendanceStatus::Invited,
+            notes: String::new(),
+        }
+    }
+    
+    /// Set the user ID
+    pub fn user_id(mut self, user_id: u32) -> Self {
+        self.user_id = user_id;
+        self
+    }
+    
+    /// Set the name
+    pub fn name(mut self, name: impl ToString) -> Self {
+        self.name = name.to_string();
+        self
+    }
+    
+    /// Set the role
+    pub fn role(mut self, role: impl ToString) -> Self {
+        self.role = role.to_string();
+        self
+    }
+    
+    /// Set the status
+    pub fn status(mut self, status: AttendanceStatus) -> Self {
+        self.status = status;
+        self
+    }
+    
+    /// Set the notes
+    pub fn notes(mut self, notes: impl ToString) -> Self {
+        self.notes = notes.to_string();
+        self
+    }
+    
+    /// Build the attendee
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+/// Meeting represents a meeting in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct Meeting {
+    pub base_data: BaseModelData,
+    pub company_id: u32,
+    pub title: String,
+    pub description: String,
+    pub meeting_type: MeetingType,
+    pub status: MeetingStatus,
+    pub start_time: DateTime<Utc>,
+    pub end_time: DateTime<Utc>,
+    pub location: String,
+    pub agenda: String,
+    pub minutes: String,
+    pub attendees: Vec<Attendee>,
+}
+
+impl Meeting {
+    /// Create a new meeting
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            company_id: 0,
+            title: String::new(),
+            description: String::new(),
+            meeting_type: MeetingType::Other,
+            status: MeetingStatus::Scheduled,
+            start_time: Utc::now(),
+            end_time: Utc::now(),
+            location: String::new(),
+            agenda: String::new(),
+            minutes: String::new(),
+            attendees: Vec::new(),
+        }
+    }
+    
+    /// Set the company ID
+    pub fn company_id(mut self, company_id: u32) -> Self {
+        self.company_id = company_id;
+        self
+    }
+    
+    /// Set the title
+    pub fn title(mut self, title: impl ToString) -> Self {
+        self.title = title.to_string();
+        self
+    }
+    
+    /// Set the description
+    pub fn description(mut self, description: impl ToString) -> Self {
+        self.description = description.to_string();
+        self
+    }
+    
+    /// Set the meeting type
+    pub fn meeting_type(mut self, meeting_type: MeetingType) -> Self {
+        self.meeting_type = meeting_type;
+        self
+    }
+    
+    /// Set the status
+    pub fn status(mut self, status: MeetingStatus) -> Self {
+        self.status = status;
+        self
+    }
+    
+    /// Set the start time
+    pub fn start_time(mut self, start_time: DateTime<Utc>) -> Self {
+        self.start_time = start_time;
+        self
+    }
+    
+    /// Set the end time
+    pub fn end_time(mut self, end_time: DateTime<Utc>) -> Self {
+        self.end_time = end_time;
+        self
+    }
+    
+    /// Set the location
+    pub fn location(mut self, location: impl ToString) -> Self {
+        self.location = location.to_string();
+        self
+    }
+    
+    /// Set the agenda
+    pub fn agenda(mut self, agenda: impl ToString) -> Self {
+        self.agenda = agenda.to_string();
+        self
+    }
+    
+    /// Set the minutes
+    pub fn minutes(mut self, minutes: impl ToString) -> Self {
+        self.minutes = minutes.to_string();
+        self
+    }
+    
+    /// Add an attendee
+    pub fn add_attendee(mut self, attendee: Attendee) -> Self {
+        self.attendees.push(attendee);
+        self
+    }
+    
+    /// Build the meeting
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for Meeting {
+    fn db_prefix() -> &'static str {
+        "meeting"
+    }
+    
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+    
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+    
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "company_id",
+                value: self.company_id.to_string(),
+            },
+            IndexKey {
+                name: "title",
+                value: self.title.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/gov/mod.rs

@@ -0,0 +1,16 @@
+pub mod company;
+pub mod shareholder;
+pub mod meeting;
+pub mod user;
+pub mod vote;
+pub mod resolution;
+pub mod committee;
+
+// Re-export all model types for convenience
+pub use company::{Company, CompanyStatus, BusinessType};
+pub use shareholder::{Shareholder, ShareholderType};
+pub use meeting::{Meeting, Attendee, MeetingStatus, MeetingType, AttendanceStatus};
+pub use user::User;
+pub use vote::{Vote, VoteOption, Ballot, VoteStatus};
+pub use resolution::{Resolution, ResolutionStatus};
+pub use committee::{Committee, CommitteeMember, CommitteeRole};

heromodels/src/models/gov/resolution.rs

@@ -0,0 +1,143 @@
+use heromodels_core::{Model, BaseModelData, BaseModelDataBuilder, IndexKey};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+/// ResolutionStatus represents the status of a resolution
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ResolutionStatus {
+    Draft,
+    Proposed,
+    Approved,
+    Rejected,
+    Expired,
+}
+
+/// ResolutionType represents the type of a resolution
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ResolutionType {
+    Ordinary,
+    Special,
+    Unanimous,
+    Written,
+    Other,
+}
+
+/// Resolution represents a resolution in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct Resolution {
+    pub base_data: BaseModelData,
+    pub company_id: u32,
+    pub title: String,
+    pub description: String,
+    pub resolution_type: ResolutionType,
+    pub status: ResolutionStatus,
+    pub proposed_date: DateTime<Utc>,
+    pub effective_date: Option<DateTime<Utc>>,
+    pub expiry_date: Option<DateTime<Utc>>,
+    pub approvals: Vec<String>,
+}
+
+impl Resolution {
+    /// Create a new resolution
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            company_id: 0,
+            title: String::new(),
+            description: String::new(),
+            resolution_type: ResolutionType::Ordinary,
+            status: ResolutionStatus::Draft,
+            proposed_date: Utc::now(),
+            effective_date: None,
+            expiry_date: None,
+            approvals: Vec::new(),
+        }
+    }
+    
+    /// Set the company ID
+    pub fn company_id(mut self, company_id: u32) -> Self {
+        self.company_id = company_id;
+        self
+    }
+    
+    /// Set the title
+    pub fn title(mut self, title: impl ToString) -> Self {
+        self.title = title.to_string();
+        self
+    }
+    
+    /// Set the description
+    pub fn description(mut self, description: impl ToString) -> Self {
+        self.description = description.to_string();
+        self
+    }
+    
+    /// Set the resolution type
+    pub fn resolution_type(mut self, resolution_type: ResolutionType) -> Self {
+        self.resolution_type = resolution_type;
+        self
+    }
+    
+    /// Set the status
+    pub fn status(mut self, status: ResolutionStatus) -> Self {
+        self.status = status;
+        self
+    }
+    
+    /// Set the proposed date
+    pub fn proposed_date(mut self, proposed_date: DateTime<Utc>) -> Self {
+        self.proposed_date = proposed_date;
+        self
+    }
+    
+    /// Set the effective date
+    pub fn effective_date(mut self, effective_date: Option<DateTime<Utc>>) -> Self {
+        self.effective_date = effective_date;
+        self
+    }
+    
+    /// Set the expiry date
+    pub fn expiry_date(mut self, expiry_date: Option<DateTime<Utc>>) -> Self {
+        self.expiry_date = expiry_date;
+        self
+    }
+    
+    /// Add an approval
+    pub fn add_approval(mut self, approval: impl ToString) -> Self {
+        self.approvals.push(approval.to_string());
+        self
+    }
+    
+    /// Build the resolution
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for Resolution {
+    fn db_prefix() -> &'static str {
+        "resolution"
+    }
+    
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+    
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+    
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "company_id",
+                value: self.company_id.to_string(),
+            },
+            IndexKey {
+                name: "title",
+                value: self.title.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/gov/shareholder.rs

@@ -0,0 +1,113 @@
+use heromodels_core::{Model, BaseModelData, BaseModelDataBuilder, IndexKey};
+use serde::{Deserialize, Serialize};
+
+/// ShareholderType represents the type of a shareholder
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ShareholderType {
+    Individual,
+    Corporate,
+    Trust,
+    Partnership,
+    Government,
+    Other,
+}
+
+/// Shareholder represents a shareholder in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct Shareholder {
+    pub base_data: BaseModelData,
+    pub company_id: u32,
+    pub name: String,
+    pub shareholder_type: ShareholderType,
+    pub contact_info: String,
+    pub shares: u32,
+    pub percentage: f64,
+}
+
+impl Shareholder {
+    /// Create a new shareholder
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            company_id: 0,
+            name: String::new(),
+            shareholder_type: ShareholderType::Individual,
+            contact_info: String::new(),
+            shares: 0,
+            percentage: 0.0,
+        }
+    }
+    
+    /// Set the company ID
+    pub fn company_id(mut self, company_id: u32) -> Self {
+        self.company_id = company_id;
+        self
+    }
+    
+    /// Set the name
+    pub fn name(mut self, name: impl ToString) -> Self {
+        self.name = name.to_string();
+        self
+    }
+    
+    /// Set the shareholder type
+    pub fn shareholder_type(mut self, shareholder_type: ShareholderType) -> Self {
+        self.shareholder_type = shareholder_type;
+        self
+    }
+    
+    /// Set the contact info
+    pub fn contact_info(mut self, contact_info: impl ToString) -> Self {
+        self.contact_info = contact_info.to_string();
+        self
+    }
+    
+    /// Set the shares
+    pub fn shares(mut self, shares: u32) -> Self {
+        self.shares = shares;
+        self
+    }
+    
+    /// Set the percentage
+    pub fn percentage(mut self, percentage: f64) -> Self {
+        self.percentage = percentage;
+        self
+    }
+    
+    /// Build the shareholder
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for Shareholder {
+    fn db_prefix() -> &'static str {
+        "shareholder"
+    }
+
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "company_id",
+                value: self.company_id.to_string(),
+            },
+            IndexKey {
+                name: "name",
+                value: self.name.clone(),
+            },
+            IndexKey {
+                name: "contact_info",
+                value: self.contact_info.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/gov/user.rs

@@ -0,0 +1,74 @@
+use heromodels_core::{Model, BaseModelData, BaseModelDataBuilder, IndexKey};
+use serde::{Deserialize, Serialize};
+
+/// User represents a user in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct User {
+    pub base_data: BaseModelData,
+    pub name: String,
+    pub email: String,
+    pub role: String,
+}
+
+impl User {
+    /// Create a new user
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            name: String::new(),
+            email: String::new(),
+            role: String::new(),
+        }
+    }
+    
+    /// Set the name
+    pub fn name(mut self, name: impl ToString) -> Self {
+        self.name = name.to_string();
+        self
+    }
+    
+    /// Set the email
+    pub fn email(mut self, email: impl ToString) -> Self {
+        self.email = email.to_string();
+        self
+    }
+    
+    /// Set the role
+    pub fn role(mut self, role: impl ToString) -> Self {
+        self.role = role.to_string();
+        self
+    }
+    
+    /// Build the user
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for User {
+    fn db_prefix() -> &'static str {
+        "gov_user"
+    }
+
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "name",
+                value: self.name.clone(),
+            },
+            IndexKey {
+                name: "email",
+                value: self.email.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/gov/vote.rs

@@ -0,0 +1,191 @@
+use heromodels_core::{Model, BaseModelData, BaseModelDataBuilder, IndexKey};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+/// VoteStatus represents the status of a vote
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum VoteStatus {
+    Draft,
+    Open,
+    Closed,
+    Cancelled,
+}
+
+/// VoteOption represents an option in a vote
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum VoteOption {
+    Yes,
+    No,
+    Abstain,
+    Custom(String),
+}
+
+/// Ballot represents a ballot cast in a vote
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Ballot {
+    pub user_id: u32,
+    pub option: VoteOption,
+    pub weight: f64,
+    pub cast_at: DateTime<Utc>,
+    pub notes: String,
+}
+
+impl Ballot {
+    /// Create a new ballot
+    pub fn new() -> Self {
+        Self {
+            user_id: 0,
+            option: VoteOption::Abstain,
+            weight: 1.0,
+            cast_at: Utc::now(),
+            notes: String::new(),
+        }
+    }
+    
+    /// Set the user ID
+    pub fn user_id(mut self, user_id: u32) -> Self {
+        self.user_id = user_id;
+        self
+    }
+    
+    /// Set the option
+    pub fn option(mut self, option: VoteOption) -> Self {
+        self.option = option;
+        self
+    }
+    
+    /// Set the weight
+    pub fn weight(mut self, weight: f64) -> Self {
+        self.weight = weight;
+        self
+    }
+    
+    /// Set the cast time
+    pub fn cast_at(mut self, cast_at: DateTime<Utc>) -> Self {
+        self.cast_at = cast_at;
+        self
+    }
+    
+    /// Set the notes
+    pub fn notes(mut self, notes: impl ToString) -> Self {
+        self.notes = notes.to_string();
+        self
+    }
+    
+    /// Build the ballot
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+/// Vote represents a vote in the governance system
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[model]
+pub struct Vote {
+    pub base_data: BaseModelData,
+    pub company_id: u32,
+    pub resolution_id: u32,
+    pub title: String,
+    pub description: String,
+    pub status: VoteStatus,
+    pub start_date: DateTime<Utc>,
+    pub end_date: DateTime<Utc>,
+    pub ballots: Vec<Ballot>,
+}
+
+impl Vote {
+    /// Create a new vote
+    pub fn new(id: u32) -> Self {
+        Self {
+            base_data: BaseModelData::new(id),
+            company_id: 0,
+            resolution_id: 0,
+            title: String::new(),
+            description: String::new(),
+            status: VoteStatus::Draft,
+            start_date: Utc::now(),
+            end_date: Utc::now(),
+            ballots: Vec::new(),
+        }
+    }
+    
+    /// Set the company ID
+    pub fn company_id(mut self, company_id: u32) -> Self {
+        self.company_id = company_id;
+        self
+    }
+    
+    /// Set the resolution ID
+    pub fn resolution_id(mut self, resolution_id: u32) -> Self {
+        self.resolution_id = resolution_id;
+        self
+    }
+    
+    /// Set the title
+    pub fn title(mut self, title: impl ToString) -> Self {
+        self.title = title.to_string();
+        self
+    }
+    
+    /// Set the description
+    pub fn description(mut self, description: impl ToString) -> Self {
+        self.description = description.to_string();
+        self
+    }
+    
+    /// Set the status
+    pub fn status(mut self, status: VoteStatus) -> Self {
+        self.status = status;
+        self
+    }
+    
+    /// Set the start date
+    pub fn start_date(mut self, start_date: DateTime<Utc>) -> Self {
+        self.start_date = start_date;
+        self
+    }
+    
+    /// Set the end date
+    pub fn end_date(mut self, end_date: DateTime<Utc>) -> Self {
+        self.end_date = end_date;
+        self
+    }
+    
+    /// Add a ballot
+    pub fn add_ballot(mut self, ballot: Ballot) -> Self {
+        self.ballots.push(ballot);
+        self
+    }
+    
+    /// Build the vote
+    pub fn build(self) -> Self {
+        self
+    }
+}
+
+impl Model for Vote {
+    fn db_prefix() -> &'static str {
+        "vote"
+    }
+    
+    fn get_id(&self) -> u32 {
+        self.base_data.id
+    }
+    
+    fn base_data_mut(&mut self) -> &mut BaseModelData {
+        &mut self.base_data
+    }
+    
+    fn db_keys(&self) -> Vec<IndexKey> {
+        vec![
+            IndexKey {
+                name: "company_id",
+                value: self.company_id.to_string(),
+            },
+            IndexKey {
+                name: "title",
+                value: self.title.clone(),
+            },
+        ]
+    }
+}

heromodels/src/models/legal/rhai.rs

@@ -94,13 +94,13 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
               -> Result<ContractRevision, Box<EvalAltResult>> {
             let version = i64_to_u32(
                 version_i64,
-                context.call_position(),
+                context.position(),
                 "version",
                 "new_contract_revision",
             )?;
             let created_at = i64_to_u64(
                 created_at_i64,
-                context.call_position(),
+                context.position(),
                 "created_at",
                 "new_contract_revision",
             )?;
@@ -170,7 +170,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<ContractSigner, Box<EvalAltResult>> {
             let signed_at_u64 = i64_to_u64(
                 signed_at_i64,
-                context.call_position(),
+                context.position(),
                 "signed_at",
                 "ContractSigner.signed_at",
             )?;
@@ -247,7 +247,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
               -> Result<Contract, Box<EvalAltResult>> {
             let base_id = i64_to_u32(
                 base_id_i64,
-                context.call_position(),
+                context.position(),
                 "base_id",
                 "new_contract",
             )?;
@@ -290,7 +290,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<Contract, Box<EvalAltResult>> {
             let start_date_u64 = i64_to_u64(
                 start_date_i64,
-                context.call_position(),
+                context.position(),
                 "start_date",
                 "Contract.start_date",
             )?;
@@ -309,7 +309,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<Contract, Box<EvalAltResult>> {
             let end_date_u64 = i64_to_u64(
                 end_date_i64,
-                context.call_position(),
+                context.position(),
                 "end_date",
                 "Contract.end_date",
             )?;
@@ -328,7 +328,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<Contract, Box<EvalAltResult>> {
             let days_i32 = i64_to_i32(
                 days_i64,
-                context.call_position(),
+                context.position(),
                 "renewal_period_days",
                 "Contract.renewal_period_days",
             )?;
@@ -348,7 +348,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<Contract, Box<EvalAltResult>> {
             let date_u64 = i64_to_u64(
                 date_i64,
-                context.call_position(),
+                context.position(),
                 "next_renewal_date",
                 "Contract.next_renewal_date",
             )?;
@@ -400,7 +400,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<Contract, Box<EvalAltResult>> {
             let version_u32 = i64_to_u32(
                 version_i64,
-                context.call_position(),
+                context.position(),
                 "current_version",
                 "Contract.current_version",
             )?;
@@ -416,7 +416,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
          -> Result<Contract, Box<EvalAltResult>> {
             let date_u64 = i64_to_u64(
                 date_i64,
-                context.call_position(),
+                context.position(),
                 "last_signed_date",
                 "Contract.last_signed_date",
             )?;
@@ -578,7 +578,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
             captured_db_for_set.set(&contract).map(|_| ()).map_err(|e| {
                 Box::new(EvalAltResult::ErrorRuntime(
                     format!(
-                        "Failed to set Contract (ID: {}): {}",
+                        "Failed to set Contract (ID: {}): {:?}",
                         contract.base_data.id, e
                     )
                     .into(),
@@ -592,7 +592,7 @@ pub fn register_legal_rhai_module(engine: &mut Engine, db: Arc<OurDB>) {
     engine.register_fn(
         "get_contract_by_id",
         move |context: NativeCallContext, id_i64: i64| -> Result<Contract, Box<EvalAltResult>> {
-            let id_u32 = i64_to_u32(id_i64, context.call_position(), "id", "get_contract_by_id")?;
+            let id_u32 = i64_to_u32(id_i64, context.position(), "id", "get_contract_by_id")?;
 
             captured_db_for_get
                 .get_by_id(id_u32)

heromodels/src/models/library/collection.rs

@@ -47,6 +47,11 @@ impl Collection {
         Self::default()
     }
 
+    /// Returns the ID of the collection.
+    pub fn id(&self) -> u32 {
+        self.base_data.id
+    }
+
     /// Sets the title of the collection.
     pub fn title(mut self, title: impl Into<String>) -> Self {
         self.title = title.into();

heromodels/src/models/library/rhai.rs

@@ -47,6 +47,12 @@ where
 #[rhai_type(name = "CollectionArray")]
 pub struct RhaiCollectionArray(pub Vec<RhaiCollection>);
 
+impl From<Vec<RhaiCollection>> for RhaiCollectionArray {
+    fn from(collections: Vec<RhaiCollection>) -> Self {
+        RhaiCollectionArray(collections)
+    }
+}
+
 #[export_module]
 mod rhai_library_module {
     // --- Collection Functions ---