Made request pass session to message.

src/client.rs

@@ -1,4 +1,5 @@
 use crate::{
+    field::Field,
     queue::{Message, MsgType, Queue},
     utils::GenID,
 };
@@ -14,20 +15,46 @@ use uuid::Uuid;
 
 const RESPONS_TO: [MsgType; 1] = [MsgType::Session];
 
-pub struct Request;
+pub struct Request {
+    pub session: Option<Field>,
+}
 
 impl Request {
-    pub fn new() -> Self {
-        Self {}
+    pub fn new(session: Option<Field>) -> Self {
+        Self { session: session }
     }
 }
 
 #[cfg(test)]
-mod requests {
+pub mod requests {
     use super::*;
 
-    pub fn create_request() -> Request {
-        Request::new()
+    pub fn get_root_document() -> Request {
+        Request::new(None)
+    }
+
+    pub fn get_root_document_eith_session<F>(id: F) -> Request
+    where
+        F: Into<Field>,
+    {
+        Request::new(Some(id.into()))
+    }
+
+    #[test]
+    fn new_request_no_session() {
+        let sess: Option<Field> = None;
+        let req = Request::new(sess);
+        assert!(req.session.is_none(), "should not have a session")
+    }
+
+    #[test]
+    fn new_request_with_session() {
+        let id = Uuid::new_v4();
+        let req = Request::new(Some(id.into()));
+        match req.session {
+            Some(result) => assert_eq!(result.to_uuid().unwrap(), id),
+            None => unreachable!("should contain a session"),
+        }
     }
 }
 
@@ -193,7 +220,7 @@ mod clientlinks {
         let (tx, rx) = channel();
         let mut registry = ClientRegistry::new();
         let mut link = ClientLink::new(tx, registry.clone());
-        let req = Request::new();
+        let req = Request::new(None);
         let rx_client = link.send(req);
         let msg = rx.recv_timeout(TIMEOUT).unwrap();
         match msg.get_class() {
@@ -266,7 +293,7 @@ impl Client {
 #[cfg(test)]
 mod clients {
     use super::*;
-    use requests::create_request;
+    use requests::get_root_document;
     use std::time::Duration;
 
     static TIMEOUT: Duration = Duration::from_millis(500);
@@ -277,7 +304,7 @@ mod clients {
         let queue = Queue::new();
         queue.add(tx, [MsgType::SessionValidate].to_vec());
         let mut link = Client::start(queue.clone());
-        let req = create_request();
+        let req = get_root_document();
         let reply_rx = link.send(req);
         let sess = rx.recv_timeout(TIMEOUT).unwrap();
         match sess.get_class() {