diff --git a/server/src/users.rs b/server/src/users.rs index fe69bfd..679cdc4 100644 --- a/server/src/users.rs +++ b/server/src/users.rs @@ -1,18 +1,21 @@ use chrono::Utc; +use std::env; use rocket_contrib::json::{Json, JsonValue}; -use crate::rand_utils::new_key; -use crate::models::{User, USER_ONLINE, USER_OFFLINE}; -use crate::{DBConn, schema}; use diesel::{self, prelude::*}; use diesel::result::Error; -pub fn create_new_user(conn: DBConn, new_name: String) -> User { +use crate::rand_utils::new_key; +use crate::models::{User, USER_ONLINE, USER_OFFLINE}; +use crate::{DBConn, schema}; + +pub fn create_new_user(new_name: String) -> User { /* * Should only eveer be called under good circumstances */ use schema::users::dsl::*; use crate::models::InsertableUser; + let conn = MysqlConnection::establish(&env::var("DATABASE_URL").unwrap()).unwrap(); let ins = InsertableUser { name: new_name, secret: new_key(), @@ -20,13 +23,13 @@ pub fn create_new_user(conn: DBConn, new_name: String) -> User { status: USER_ONLINE, }; // insert the nwe user data then return usable user data to the client - diesel::insert_into(users) + let _inserted_user = diesel::insert_into(users) .values(&ins) - .execute(&conn.0); + .execute(&conn); let new_user_data : Result = users .filter(id.eq(ins.date)) - .first(&conn.0); + .first(&conn); new_user_data.unwrap() }