fix merge issues and rhai examples wip

heromodels/src/models/calendar/rhai.rs

@@ -1,25 +1,50 @@
-use rhai::{Engine, EvalAltResult, NativeCallContext};
+use rhai::{Engine, EvalAltResult, NativeCallContext, ImmutableString};
 use std::sync::Arc;
 
 use heromodels_core::BaseModelData;
 use crate::db::hero::OurDB;
 use super::calendar::{Calendar, Event, Attendee, AttendanceStatus};
 use adapter_macros::{adapt_rhai_i64_input_fn, adapt_rhai_i64_input_method};
-use rhai_wrapper::wrap_vec_return;
+use adapter_macros::rhai_timestamp_helpers;
 
 // Helper function for get_all_calendars registration
-fn get_all_calendars_helper(_db: Arc<OurDB>) -> Vec<Calendar> { 
-    // In a real implementation, this would retrieve all calendars from the database
-    vec![Calendar::new(1 as u32), Calendar::new(2 as u32)] 
+
+
+fn new_calendar_rhai(name: String) -> Result<Calendar, Box<EvalAltResult>> {
+        Ok(Calendar::new(None, name))
+}
+
+fn new_event_rhai(
+    context: NativeCallContext,
+    title_rhai: ImmutableString,
+    start_time_ts: i64,
+    end_time_ts: i64,
+) -> Result<Event, Box<EvalAltResult>> {
+    let start_time = rhai_timestamp_helpers::rhai_timestamp_to_datetime(start_time_ts)
+        .map_err(|e_str| Box::new(EvalAltResult::ErrorRuntime(
+            format!("Failed to convert start_time for Event: {}", e_str).into(),
+            context.position(),
+        )))?;
+
+    let end_time = rhai_timestamp_helpers::rhai_timestamp_to_datetime(end_time_ts)
+        .map_err(|e_str| Box::new(EvalAltResult::ErrorRuntime(
+            format!("Failed to convert end_time for Event: {}", e_str).into(),
+            context.position(),
+        )))?;
+
+        Ok(Event::new(title_rhai.to_string(), start_time, end_time))
 }
 
 pub fn register_rhai_engine_functions(engine: &mut Engine, db: Arc<OurDB>) {
-    engine.register_fn("new_calendar", adapt_rhai_i64_input_fn!(Calendar::new, u32));
     engine.register_fn("name", move |calendar: Calendar, name: String| Calendar::name(calendar, name));
     engine.register_fn("description", move |calendar: Calendar, description: String| Calendar::description(calendar, description));
-    engine.register_fn("add_event", Calendar::add_event); // Corrected: expects i64, Rhai provides i64
+        engine.register_fn("add_event", Calendar::add_event);
+    // Note: Event IDs are i64 in Calendar.events, but Event model's base_data.id is u32.
+    // This might require adjustment if events are fetched by ID from the DB via Calendar.events.
     
-    engine.register_fn("new_event", Event::new); // Corrected: expects i64, Rhai provides i64
+        engine.register_fn("new_event", |context: NativeCallContext, title_rhai: ImmutableString, start_time_ts: i64, end_time_ts: i64| -> Result<Event, Box<EvalAltResult>> {
+        new_event_rhai(context, title_rhai, start_time_ts, end_time_ts)
+    });
     engine.register_fn("title", move |event: Event, title: String| Event::title(event, title));
     engine.register_fn("description", move |event: Event, description: String| Event::description(event, description));
     engine.register_fn("add_attendee", move |event: Event, attendee: Attendee| Event::add_attendee(event, attendee));
@@ -36,6 +61,8 @@ pub fn register_rhai_engine_functions(engine: &mut Engine, db: Arc<OurDB>) {
 
     engine.register_fn("new_attendee", adapt_rhai_i64_input_fn!(Attendee::new, u32));
 
+        engine.register_fn("new_calendar", |name: String| -> Result<Calendar, Box<EvalAltResult>> { new_calendar_rhai(name) });
+
     // Register a function to get the database instance
     engine.register_fn("get_db", move || db.clone());
     
@@ -53,24 +80,8 @@ pub fn register_rhai_engine_functions(engine: &mut Engine, db: Arc<OurDB>) {
     // Register getters for BaseModelData
     engine.register_get("id", |bmd: &mut BaseModelData| -> Result<i64, Box<EvalAltResult>> { Ok(bmd.id.into()) }); 
 
-    // Mock database interaction functions from the example - these would typically interact with the `db` Arc
-    engine.register_fn("set_calendar", |_db: Arc<OurDB>, calendar: Calendar| { 
-        println!("Mock save: Calendar saved: {}", calendar.name);
-    });
-    
-    engine.register_fn("get_calendar_by_id", |_db: Arc<OurDB>, id_i64: i64| -> Calendar { 
-        Calendar::new(id_i64 as u32) 
-    });
-    
-    engine.register_fn("calendar_exists", |_db: Arc<OurDB>, id_i64: i64| -> bool { 
-        id_i64 == 1 || id_i64 == 2 // Mock check
-    });
-        
-    engine.register_fn("get_all_calendars", wrap_vec_return!(get_all_calendars_helper, Arc<OurDB> => Calendar)); 
-    
-    engine.register_fn("delete_calendar_by_id", |_db: Arc<OurDB>, id_i64: i64| { 
-        println!("Mock delete: Calendar deleted with ID: {}", id_i64);
-    });
+    // Database interaction functions for Calendar are expected to be provided by #[rhai_model_export(..)] on the Calendar struct.
+    // Ensure that `db.rs` or similar correctly wires up the `OurDB` methods for these.
 
     // Getters for Event
     engine.register_get("id", |e: &mut Event| -> Result<i64, Box<EvalAltResult>> { Ok(e.base_data.id as i64) });