From ce8f6e3b96e71de9128010aa0909ecf397e52b47 Mon Sep 17 00:00:00 2001
From: Horhik <horhik@tuta.io>
Date: Fri, 26 Mar 2021 21:49:08 +0300
Subject: [PATCH] split request_handler by unimplementend blocks

---
 src/api/handlers.rs | 39 +++++++++++++++++--
 src/api/request.rs  | 94 +++++++++++++++++++++++----------------------
 2 files changed, 85 insertions(+), 48 deletions(-)

diff --git a/src/api/handlers.rs b/src/api/handlers.rs
index c502852..2b0bc48 100644
--- a/src/api/handlers.rs
+++ b/src/api/handlers.rs
@@ -1,9 +1,42 @@
-use rusqlite;
 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<()>{
-    unimplemented!()
+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/request.rs b/src/api/request.rs
index 4dc998d..93d1018 100644
--- a/src/api/request.rs
+++ b/src/api/request.rs
@@ -1,63 +1,67 @@
 use fcpv2::types::SSK;
-use serde_json::Result;
 use serde_derive::{Deserialize, Serialize};
+use serde_json::Result;
 
-#[derive(Serialize, Deserialize)]
-pub struct Address {
-    street: String,
-    city: String,
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct CreateInstance;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct SendMessage;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct LoadUsers;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct LoadMessages;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct AddUser;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct StartApp;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct StopApp;
+
+#[derive(Deserialize, Debug)]
+pub struct CreateInstanceReq {
+    pub req_type: CreateInstance,
+    pub name: String,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-pub enum RequestType {
-    CreateInstance,
-    StartApp,
-    StopApp,
-    SendMessage,
-    LoadUsers,
-    LoadMessages,
-    AddUser,
+#[derive(Deserialize, Debug, PartialEq)]
+pub struct StartAppReq {
+    pub req_type: StartApp,
+}
+
+#[derive(Deserialize, Debug, PartialEq)]
+pub struct StopAppReq {
+    pub(crate) req_type: StopApp,
 }
 
 #[derive(Deserialize, Debug)]
-struct CreateInstance {
-    req_type: RequestType,
-    name: String,
+pub struct LoadUsersReq {
+    pub req_type: LoadUsers,
 }
 
 #[derive(Deserialize, Debug)]
-struct StartApp {
-    req_type: RequestType,
+pub struct SendMessageReq {
+    pub req_type: SendMessage,
+    pub user_id: u32,
+    pub message: String,
 }
 
 #[derive(Deserialize, Debug)]
-struct StopApp {
-    req_type: RequestType,
-}
-#[derive(Deserialize, Debug)]
-struct SendMessage {
-    req_type: RequestType,
-    user_id: u32,
-    message: String,
-}
-#[derive(Deserialize, Debug)]
-struct LoadUsers {
-    req_type: RequestType,
+pub struct LoadMessagesReq {
+    pub req_type: LoadMessages,
+    pub user_id: u32,
+    pub count: u8,
+    pub start_index: u8,
 }
 
 #[derive(Deserialize, Debug)]
-struct LoadMessages {
-    req_type: RequestType,
-    user_id: u32,
-    count: u8,
-    start_index: u8,
+pub struct AddUserReq {
+    pub req_type: AddUser,
+    pub sign_key: String,
+    pub insert_key: String,
 }
-
-
-#[derive(Deserialize, Debug)]
-struct AddUser {
-    req_type: RequestType,
-    sign_key: String,
-    insert_key: String,
-}
-