Refactored clock.

src/document/session.rs

@@ -1,5 +1,6 @@
 use crate::{
     document::{
+        clock::Clock,
         create::IndexType,
         definition::{DocDef, DocFuncType},
         field::FieldType,
@@ -40,6 +41,7 @@ impl Session {
         let name_expire = Name::english("expire");
         docdef.add_field(name_expire.clone(), FieldType::DateTime);
         docdef.set_default(&name_expire, calc.clone()).unwrap();
+        docdef.add_index(&name_expire, IndexType::Index).unwrap();
 
         let mut update = Update::new(Query::new());
         update
@@ -61,13 +63,8 @@ impl Session {
             .unwrap();
         delete_qry.add(name_expire.clone(), delete_calc);
         let delete = Delete::new(delete_qry);
-        let clock_path = Path::new(
-            Include::All,
-            Include::Just(Name::english("clock").into()),
-            Include::Just(Action::OnUpdate),
-        );
         let delete_func = DocFuncType::Trigger(delete.into());
-        docdef.add_route(clock_path, delete_func);
+        docdef.add_route(Clock::get_path(), delete_func);
 
         let (tx, rx) = channel();
         let sender_id = queue.add_sender(tx);
@@ -91,7 +88,7 @@ impl Session {
 mod sessions {
     use super::*;
     use crate::{
-        document::{clock::Clock, create::CreateDoc, field::Field},
+        document::{clock::{Clock,  clock_test_support::gen_clock_message}, create::CreateDoc, field::Field},
         message::{
             action::MsgAction,
             wrapper::{Addition, Query, Records},
@@ -328,10 +325,7 @@ mod sessions {
         setup.send(Setup::message(addition2));
         setup.recv().unwrap(); // Eat addition result.
         setup.recv().unwrap(); // Eat addition result.
-        setup.send(Message::new(
-            Name::english("clock"),
-            MsgAction::OnUpdate(Records::new(Names::new())),
-        ));
+        setup.send(gen_clock_message());
         sleep(TIMEOUT); // Allow time to react to message.
         setup.send(Setup::message(Query::new()));
         let result = setup.recv().unwrap();