From 4fa190effa3c3e790c26fd53c03a9a8f73e5daf7 Mon Sep 17 00:00:00 2001
From: Horhik <horhik@tuta.io>
Date: Fri, 26 Mar 2021 21:50:57 +0300
Subject: [PATCH] rename request_handler to request_selector

---
 src/api/handlers.rs    | 42 ------------------------------------------
 src/api/mod.rs         |  1 +
 src/api/selector.rs    | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/chat/front_conn.rs |  4 ++--
 4 files changed, 45 insertions(+), 44 deletions(-)
 create mode 100644 src/api/selector.rs

diff --git a/src/api/handlers.rs b/src/api/handlers.rs
index 2b0bc48..e69de29 100644
--- a/src/api/handlers.rs
+++ b/src/api/handlers.rs
@@ -1,42 +0,0 @@
-use crate::chat::types::SP;
-use rusqlite;
-
-use super::request::*;
-use async_std::io::Result;
-use rusqlite::Connection;
-use serde_json::from_str;
-use serde_json::json;
-// server_sender sending data to server thread;
-pub async fn request_handler(json: String, server_sender: &SP, conn: &Connection) -> Result<()> {
-    // if let Ok(res) = from_str::<CreateInstanceReq>(&json) {
-    //TODO v0.3 Add Instances     return Ok(());
-    // }
-
-     if let Ok(res) = from_str::<StartAppReq>(&json) {
-        return Ok(());
-    }
-    if let Ok(res) = from_str::<StopAppReq>(&json) {
-        return Ok(());
-    }
-    if let Ok(res) = from_str::<LoadUsersReq>(&json) {
-        return Ok(());
-    }
-    if let Ok(res) = from_str::<SendMessageReq>(&json) {
-        return Ok(());
-    }
-    if let Ok(res) = from_str::<LoadMessagesReq>(&json) {
-        return Ok(());
-    }
-    if let Ok(res) = from_str::<AddUserReq>(&json) {
-        return Ok(());
-    }
-    Err(async_std::io::Error::new(
-        async_std::io::ErrorKind::InvalidData,
-        "Wrong request",
-    ))
-}
-
-#[test]
-fn is_making_correct_jsons() {
-    let json = from_str::<StopApp>("{\"req_type\":\"StartAppReq\"}").unwrap();
-}
diff --git a/src/api/mod.rs b/src/api/mod.rs
index bbce93f..09f8a71 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,3 +1,4 @@
 pub mod request;
 pub mod response;
 pub mod handlers;
+pub mod selector;
diff --git a/src/api/selector.rs b/src/api/selector.rs
new file mode 100644
index 0000000..836d85d
--- /dev/null
+++ b/src/api/selector.rs
@@ -0,0 +1,42 @@
+use crate::chat::types::SP;
+use rusqlite;
+
+use super::request::*;
+use async_std::io::Result;
+use rusqlite::Connection;
+use serde_json::from_str;
+use serde_json::json;
+// server_sender sending data to server thread;
+pub async fn request_selector(json: String, server_sender: &SP, conn: &Connection) -> Result<()> {
+    // if let Ok(res) = from_str::<CreateInstanceReq>(&json) {
+    //TODO v0.3 Add Instances     return Ok(());
+    // }
+
+     if let Ok(res) = from_str::<StartAppReq>(&json) {
+        return Ok(());
+    }
+    if let Ok(res) = from_str::<StopAppReq>(&json) {
+        return Ok(());
+    }
+    if let Ok(res) = from_str::<LoadUsersReq>(&json) {
+        return Ok(());
+    }
+    if let Ok(res) = from_str::<SendMessageReq>(&json) {
+        return Ok(());
+    }
+    if let Ok(res) = from_str::<LoadMessagesReq>(&json) {
+        return Ok(());
+    }
+    if let Ok(res) = from_str::<AddUserReq>(&json) {
+        return Ok(());
+    }
+    Err(async_std::io::Error::new(
+        async_std::io::ErrorKind::InvalidData,
+        "Wrong request",
+    ))
+}
+
+#[test]
+fn is_making_correct_jsons() {
+    let json = from_str::<StopApp>("{\"req_type\":\"StartAppReq\"}").unwrap();
+}
diff --git a/src/chat/front_conn.rs b/src/chat/front_conn.rs
index c5c683a..b6e6e3c 100644
--- a/src/chat/front_conn.rs
+++ b/src/chat/front_conn.rs
@@ -18,7 +18,7 @@ use super::stay_awake::request_repeater;
 
 use super::types::{RP, SP};
 
-use crate::api::handlers::request_handler;
+use crate::api::selector::request_selector;
 
 #[derive(Deserialize, Debug)]
 struct FrontMsg {
@@ -101,7 +101,7 @@ async fn connection_for_sending(
     loop {
         if let Some(msg) = new_msg.await {
             let jsoned = msg.expect("Falied to unwrap gotted message");
-            request_handler(jsoned.to_string(), &server_sender, &conn);
+            request_selector(jsoned.to_string(), &server_sender, &conn);
             /*
             let res: serde_json::Result<FrontMsg> =
                 serde_json::from_str(jsoned.to_text().expect("Falied to parse JSON"));