backend: Use enum to handle multiple db requests

diff --git a/back_end/.gitignore b/back_end/.gitignore
index ea8c4bf7f35f6f77f75d92ad8ce8349f6e81ddba..b35a3738405833559f000ff49bb2da08c15560c0 100644 (file)
--- a/back_end/.gitignore
+++ b/back_end/.gitignore
@@ -1 +1,3 @@
 /target
+fourLineDropper.db
+.dump

diff --git a/back_end/src/db_handler.rs b/back_end/src/db_handler.rs
index b432653874ea67dc92a757f10076280f065aae0d..ad9b4754b4d4994b97822f392aa460a0fd837154 100644 (file)
--- a/back_end/src/db_handler.rs
+++ b/back_end/src/db_handler.rs
@@ -4,6 +4,11 @@ use std::thread;
 use rand::{thread_rng, Rng};
 use rusqlite::Connection;
 
+#[derive(Clone, Debug)]
+pub enum DBHandlerRequest {
+    GetID(SyncSender<u32>),
+}
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 enum DBFirstRun {
     FirstRun,
@@ -58,7 +63,7 @@ fn init_conn(sqlite_path: &str, first_run: DBFirstRun) -> Result<Connection, Str
 }
 
 pub fn start_db_handler_thread(
-    rx: Receiver<SyncSender<u32>>,
+    rx: Receiver<DBHandlerRequest>,
     sqlite_path: String,
     shutdown_tx: SyncSender<()>,
 ) {
@@ -74,52 +79,55 @@ pub fn start_db_handler_thread(
         'outer: loop {
             let rx_recv_result = rx.recv();
             if let Err(e) = rx_recv_result {
-                println!("Failed to get player_tx: {:?}", e);
+                println!("Failed to get DBHandlerRequest: {:?}", e);
                 shutdown_tx.send(()).ok();
                 break;
             }
-            let player_tx = rx_recv_result.unwrap();
-
-            // got request to create new player, create new player
-            let mut player_id: u32 = thread_rng().gen();
-            let conn_result = init_conn(&sqlite_path, DBFirstRun::NotFirstRun);
-            if let Err(e) = conn_result {
-                println!("Failed to get sqlite db connection: {:?}", e);
-                shutdown_tx.send(()).ok();
-                break;
-            }
-            let conn = conn_result.unwrap();
-            loop {
-                let stmt_result = conn.prepare("SELECT id FROM players WHERE id = ?;");
-                if let Err(e) = stmt_result {
-                    println!("Failed to create sqlite statement: {:?}", e);
-                    shutdown_tx.send(()).ok();
-                    break 'outer;
-                }
-                let mut stmt = stmt_result.unwrap();
-                match stmt.query_row([player_id], |_row| Ok(())) {
-                    Ok(_) => {
-                        player_id = thread_rng().gen();
+            let db_request = rx_recv_result.unwrap();
+            match db_request {
+                DBHandlerRequest::GetID(player_tx) => {
+                    // got request to create new player, create new player
+                    let mut player_id: u32 = thread_rng().gen();
+                    let conn_result = init_conn(&sqlite_path, DBFirstRun::NotFirstRun);
+                    if let Err(e) = conn_result {
+                        println!("Failed to get sqlite db connection: {:?}", e);
+                        shutdown_tx.send(()).ok();
+                        break;
                     }
-                    Err(_) => break,
+                    let conn = conn_result.unwrap();
+                    loop {
+                        let stmt_result = conn.prepare("SELECT id FROM players WHERE id = ?;");
+                        if let Err(e) = stmt_result {
+                            println!("Failed to create sqlite statement: {:?}", e);
+                            shutdown_tx.send(()).ok();
+                            break 'outer;
+                        }
+                        let mut stmt = stmt_result.unwrap();
+                        match stmt.query_row([player_id], |_row| Ok(())) {
+                            Ok(_) => {
+                                player_id = thread_rng().gen();
+                            }
+                            Err(_) => break,
+                        }
+                    }
+                    let insert_result = conn.execute(
+                        "INSERT INTO players (id, date_added) VALUES (?, datetime());",
+                        [player_id],
+                    );
+                    if let Err(e) = insert_result {
+                        println!("Failed to insert into sqlite db: {:?}", e);
+                        shutdown_tx.send(()).ok();
+                        break 'outer;
+                    }
+                    let send_result = player_tx.send(player_id);
+                    if let Err(e) = send_result {
+                        println!("Failed to send back player id: {:?}", e);
+                        shutdown_tx.send(()).ok();
+                        break 'outer;
+                    }
+                    send_result.unwrap();
                 }
             }
-            let insert_result = conn.execute(
-                "INSERT INTO players (id, date_added) VALUES (?, datetime());",
-                [player_id],
-            );
-            if let Err(e) = insert_result {
-                println!("Failed to insert into sqlite db: {:?}", e);
-                shutdown_tx.send(()).ok();
-                break 'outer;
-            }
-            let send_result = player_tx.send(player_id);
-            if let Err(e) = send_result {
-                println!("Failed to send back player id: {:?}", e);
-                shutdown_tx.send(()).ok();
-                break 'outer;
-            }
-            send_result.unwrap();
 
             // Pair up players
             // TODO

diff --git a/back_end/src/json_handlers.rs b/back_end/src/json_handlers.rs
index dfe2c778b731c5522b4000c57411aef970f6dc35..acd01ebaad454904f22cd9a4e2bd57c715056181 100644 (file)
--- a/back_end/src/json_handlers.rs
+++ b/back_end/src/json_handlers.rs
@@ -1,3 +1,5 @@
+use crate::db_handler::DBHandlerRequest;
+
 use std::{
     sync::mpsc::{sync_channel, SyncSender},
     time::Duration,
@@ -7,7 +9,7 @@ use serde_json::Value;
 
 pub fn handle_json(
     root: Value,
-    tx: SyncSender<SyncSender<u32>>,
+    tx: SyncSender<DBHandlerRequest>,
     _shutdown_tx: SyncSender<()>, // maybe used here, not sure if it will be
 ) -> Result<String, String> {
     if let Some(Value::String(type_str)) = root.get("type") {
@@ -24,9 +26,9 @@ pub fn handle_json(
     }
 }
 
-fn handle_pairing_request(tx: SyncSender<SyncSender<u32>>) -> Result<String, String> {
+fn handle_pairing_request(tx: SyncSender<DBHandlerRequest>) -> Result<String, String> {
     let (player_tx, player_rx) = sync_channel::<u32>(1);
-    if tx.send(player_tx).is_err() {
+    if tx.send(DBHandlerRequest::GetID(player_tx)).is_err() {
         return Err("{\"type\":\"pairing_response\", \"status\":\"internal_error\"}".into());
     }
     if let Ok(pid) = player_rx.recv_timeout(Duration::from_secs(5)) {

diff --git a/back_end/src/main.rs b/back_end/src/main.rs
index bdef11e386b73f7ea96edc4d8fdab6f7159317b4..454bc7580708f41b9c3a77bad65a84ce33f8bfa2 100644 (file)
--- a/back_end/src/main.rs
+++ b/back_end/src/main.rs
@@ -3,7 +3,9 @@ mod json_handlers;
 
 const SQLITE_DB_PATH: &str = "./fourLineDropper.db";
 
-use std::sync::mpsc::{sync_channel, SyncSender};
+use db_handler::DBHandlerRequest;
+
+use std::sync::mpsc::sync_channel;
 
 use db_handler::start_db_handler_thread;
 use tokio::sync::oneshot;
@@ -11,7 +13,7 @@ use warp::{Filter, Rejection};
 
 #[tokio::main]
 async fn main() {
-    let (db_tx, db_rx) = sync_channel::<SyncSender<u32>>(32);
+    let (db_tx, db_rx) = sync_channel::<DBHandlerRequest>(32);
     let db_tx_clone = db_tx.clone();
 
     let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();