From 65a541fd0b32adc68f3bbbab14145ebf563b7ae1 Mon Sep 17 00:00:00 2001 From: mrw1593 Date: Sat, 13 May 2023 13:53:34 -0400 Subject: Change user_id to id --- sqlx-data.json | 166 ++++++++++++++++++++++++++--------------------------- src/api/users.rs | 4 +- src/models/user.rs | 6 +- src/services/db.rs | 32 +++++------ 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/sqlx-data.json b/sqlx-data.json index 244b873..4cab0aa 100644 --- a/sqlx-data.json +++ b/sqlx-data.json @@ -1,10 +1,10 @@ { "db": "MySQL", - "016610abc2d730ab748db57c97ea3d7c2cc38d1f3dbc7dfef86742454d4b15f1": { + "2e6664bc143576c82ced1c6e58fdcd39606d0fa5c2d74f7eb4680f72cb3bede2": { "describe": { "columns": [ { - "name": "user_id", + "name": "id", "ordinal": 0, "type_info": { "char_set": 63, @@ -75,63 +75,13 @@ "Right": 1 } }, - "query": "SELECT user_id, username, password_hash, password_salt, password_version\n\t\t FROM users WHERE user_id = ?" + "query": "SELECT id, username, password_hash, password_salt, password_version\n\t\t FROM users WHERE id = ?" }, - "0e1cd93286d20bbaa3e25dbec43b5e28cfbe6506d2d47432259e228f7f92c867": { + "3803dd22a747fc5f3d9b56248c2372be8050a77771a898a531fb8cb6cb1aaf1f": { "describe": { "columns": [ { - "name": "username", - "ordinal": 0, - "type_info": { - "char_set": 224, - "flags": { - "bits": 4101 - }, - "max_size": 1020, - "type": "VarString" - } - } - ], - "nullable": [ - false - ], - "parameters": { - "Right": 1 - } - }, - "query": "SELECT username FROM users where user_id = ?" - }, - "2a874f8bf5448493f2724b31022f3f8ebb535de0d780c19bb11e70d0da3e12fb": { - "describe": { - "columns": [ - { - "name": "e: bool", - "ordinal": 0, - "type_info": { - "char_set": 63, - "flags": { - "bits": 129 - }, - "max_size": 1, - "type": "LongLong" - } - } - ], - "nullable": [ - false - ], - "parameters": { - "Right": 1 - } - }, - "query": "SELECT EXISTS(SELECT user_id FROM users WHERE username = ?) as \"e: bool\"" - }, - "370adb0e591634e2bc2e0cd904881f79192869a250eb6e1ba02e5074544a58cf": { - "describe": { - "columns": [ - { - "name": "user_id", + "name": "id", "ordinal": 0, "type_info": { "char_set": 63, @@ -202,13 +152,13 @@ "Right": 3 } }, - "query": "SELECT user_id, username, password_hash, password_salt, password_version\n\t\t FROM users\n\t\t WHERE LOCATE(?, username) != 0\n\t\t LIMIT ?\n\t\t OFFSET ?" + "query": "SELECT id, username, password_hash, password_salt, password_version\n\t\t FROM users\n\t\t WHERE LOCATE(?, username) != 0\n\t\t LIMIT ?\n\t\t OFFSET ?" }, - "65b0c5cb580ec3b8867ba7733cda3fddb665e1a5581911d8f0d4c64891871521": { + "41ce01000e31fd3df199a16cc5d9835fd21319103f8615ef71960f78d8c1ae3c": { "describe": { "columns": [ { - "name": "user_id", + "name": "id", "ordinal": 0, "type_info": { "char_set": 63, @@ -279,19 +229,9 @@ "Right": 1 } }, - "query": "SELECT user_id, username, password_hash, password_salt, password_version\n\t\t FROM users\n\t\t WHERE LOCATE(?, username) != 0" - }, - "75241e6a872d943242a56e45e1ea9338caff4863a81c2fc6a2f02e6fa2762e29": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Right": 5 - } - }, - "query": "INSERT INTO users (user_id, username, password_hash, password_salt, password_version)\n\t\t\t\t\t VALUES (?, ?, ?, ?, ?)" + "query": "SELECT id, username, password_hash, password_salt, password_version\n\t\t FROM users\n\t\t WHERE LOCATE(?, username) != 0" }, - "94861f28bcf36f07d35f3e5f9082fc9441cb1a4d172d256ec99f9bf9bfbd61b9": { + "6c084e6931262b2e4a735a056022ed1aa4fddd65fca68f5193fc899f24c1220b": { "describe": { "columns": [], "nullable": [], @@ -299,23 +239,38 @@ "Right": 5 } }, - "query": "UPDATE users SET\n\t\t username = ?,\n\t\t password_hash = ?,\n\t\t password_salt = ?,\n\t\t password_version = ?\n\t\t WHERE user_id = ?" + "query": "INSERT INTO users (id, username, password_hash, password_salt, password_version)\n\t\t\t\t\t VALUES (?, ?, ?, ?, ?)" }, - "c9f329258c6470cd472657e202d3b2be0ff0b2488d00785ebfdf65ab751984ab": { + "76a5f21dacb2b48fb797bcc0e5054b519192ae0bb6dcf8c29fbf9c2913b4746b": { "describe": { - "columns": [], - "nullable": [], + "columns": [ + { + "name": "username", + "ordinal": 0, + "type_info": { + "char_set": 224, + "flags": { + "bits": 4101 + }, + "max_size": 1020, + "type": "VarString" + } + } + ], + "nullable": [ + false + ], "parameters": { - "Right": 4 + "Right": 1 } }, - "query": "UPDATE users SET\n\t\tpassword_hash = ?,\n\t\tpassword_salt = ?,\n\t\tpassword_version = ?\n\t\tWHERE user_id = ?" + "query": "SELECT username FROM users where id = ?" }, - "e87cb729ff241fce8e1ddcd43519105910b61184b1ed755a437bd511eac4f9cf": { + "7b8de80e805fff9ea8a461cc7708cafb062539ca4b75b2f66bfaf44987c736c9": { "describe": { "columns": [ { - "name": "user_id", + "name": "id", "ordinal": 0, "type_info": { "char_set": 63, @@ -386,9 +341,9 @@ "Right": 1 } }, - "query": "SELECT user_id, username, password_hash, password_salt, password_version\n\t\t FROM users WHERE username = ?" + "query": "SELECT id, username, password_hash, password_salt, password_version\n\t\t FROM users WHERE username = ?" }, - "ed4a40d7a9417985e6552d368146f5791717a41c16921f5074dfa14b637a9209": { + "9710cd5915616165c6d27031b21cc7b3cfbd5aae574eb07797dca57064880ef9": { "describe": { "columns": [], "nullable": [], @@ -396,9 +351,9 @@ "Right": 2 } }, - "query": "UPDATE users SET username = ? WHERE user_id = ?" + "query": "UPDATE users SET username = ? WHERE id = ?" }, - "ef52d73fde91d8771b14607544be1c12985e7db6c902062a2addd3b367502745": { + "b1d60244a68b9c132e5b3125505606d156913acf062802e4e1783f9e859f4c49": { "describe": { "columns": [ { @@ -421,6 +376,51 @@ "Right": 1 } }, - "query": "SELECT EXISTS(SELECT user_id FROM users WHERE user_id = ?) as \"e: bool\"" + "query": "SELECT EXISTS(SELECT id FROM users WHERE username = ?) as \"e: bool\"" + }, + "b6c6433f0080471d1db6875bdbbe633cd56d781e80f7cbe854f80a5a11aa4a8f": { + "describe": { + "columns": [ + { + "name": "e: bool", + "ordinal": 0, + "type_info": { + "char_set": 63, + "flags": { + "bits": 129 + }, + "max_size": 1, + "type": "LongLong" + } + } + ], + "nullable": [ + false + ], + "parameters": { + "Right": 1 + } + }, + "query": "SELECT EXISTS(SELECT id FROM users WHERE id = ?) as \"e: bool\"" + }, + "df0033aa7c0e5066fed30d944387293d26d1de93b1a24a202214d6ee06fc6a1c": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Right": 4 + } + }, + "query": "UPDATE users SET\n\t\tpassword_hash = ?,\n\t\tpassword_salt = ?,\n\t\tpassword_version = ?\n\t\tWHERE id = ?" + }, + "f9d2c85bdcc3b7d0d1fca4e2f0bb37df6dee23bc50af97d8e4112baacd6eb7c9": { + "describe": { + "columns": [], + "nullable": [], + "parameters": { + "Right": 5 + } + }, + "query": "UPDATE users SET\n\t\t username = ?,\n\t\t password_hash = ?,\n\t\t password_salt = ?,\n\t\t password_version = ?\n\t\t WHERE id = ?" } } \ No newline at end of file diff --git a/src/api/users.rs b/src/api/users.rs index b2dd1c7..d62cc27 100644 --- a/src/api/users.rs +++ b/src/api/users.rs @@ -141,7 +141,7 @@ async fn create_user( } let user = User { - user_id, + id: user_id, username, password, }; @@ -193,7 +193,7 @@ async fn update_user( } let user = User { - user_id, + id: user_id, username, password, }; diff --git a/src/models/user.rs b/src/models/user.rs index 4649890..8555ee2 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -7,14 +7,14 @@ use crate::services::crypto::PasswordHash; #[derive(Debug, Clone)] pub struct User { - pub user_id: Uuid, + pub id: Uuid, pub username: Box, pub password: PasswordHash, } impl PartialEq for User { fn eq(&self, other: &Self) -> bool { - self.user_id == other.user_id + self.id == other.id } } @@ -22,7 +22,7 @@ impl Eq for User {} impl Hash for User { fn hash(&self, state: &mut H) { - state.write_u128(self.user_id.as_u128()) + state.write_u128(self.id.as_u128()) } } diff --git a/src/services/db.rs b/src/services/db.rs index d717594..6136a89 100644 --- a/src/services/db.rs +++ b/src/services/db.rs @@ -7,7 +7,7 @@ use crate::models::User; use super::crypto::PasswordHash; struct UserRow { - user_id: Vec, + id: Vec, username: String, password_hash: Vec, password_salt: Vec, @@ -24,7 +24,7 @@ impl TryFrom for User { row.password_version as u8, ); let user = User { - user_id: Uuid::from_slice(&row.user_id)?, + id: Uuid::from_slice(&row.id)?, username: row.username.into_boxed_str(), password, }; @@ -42,7 +42,7 @@ pub async fn user_id_exists<'c>( id: Uuid, ) -> Result { let exists = query_scalar!( - r#"SELECT EXISTS(SELECT user_id FROM users WHERE user_id = ?) as "e: bool""#, + r#"SELECT EXISTS(SELECT id FROM users WHERE id = ?) as "e: bool""#, id ) .fetch_one(conn) @@ -56,7 +56,7 @@ pub async fn username_is_used<'c>( username: &str, ) -> Result { let exists = query_scalar!( - r#"SELECT EXISTS(SELECT user_id FROM users WHERE username = ?) as "e: bool""#, + r#"SELECT EXISTS(SELECT id FROM users WHERE username = ?) as "e: bool""#, username ) .fetch_one(conn) @@ -71,8 +71,8 @@ pub async fn get_user<'c>( ) -> Result, RawUnexpected> { let record = query_as!( UserRow, - r"SELECT user_id, username, password_hash, password_salt, password_version - FROM users WHERE user_id = ?", + r"SELECT id, username, password_hash, password_salt, password_version + FROM users WHERE id = ?", user_id ) .fetch_optional(conn) @@ -89,7 +89,7 @@ pub async fn get_user_by_username<'c>( ) -> Result, RawUnexpected> { let record = query_as!( UserRow, - r"SELECT user_id, username, password_hash, password_salt, password_version + r"SELECT id, username, password_hash, password_salt, password_version FROM users WHERE username = ?", username ) @@ -108,7 +108,7 @@ pub async fn search_users<'c>( let username = format!("%{username}%"); let records = query_as!( UserRow, - r"SELECT user_id, username, password_hash, password_salt, password_version + r"SELECT id, username, password_hash, password_salt, password_version FROM users WHERE LOCATE(?, username) != 0", username, @@ -131,7 +131,7 @@ pub async fn search_users_limit<'c>( let username = format!("%{username}%"); let records = query_as!( UserRow, - r"SELECT user_id, username, password_hash, password_salt, password_version + r"SELECT id, username, password_hash, password_salt, password_version FROM users WHERE LOCATE(?, username) != 0 LIMIT ? @@ -153,7 +153,7 @@ pub async fn get_username<'c>( conn: impl Executor<'c, Database = MySql>, user_id: Uuid, ) -> Result>, RawUnexpected> { - let username = query_scalar!(r"SELECT username FROM users where user_id = ?", user_id) + let username = query_scalar!(r"SELECT username FROM users where id = ?", user_id) .fetch_optional(conn) .await? .map(String::into_boxed_str); @@ -166,9 +166,9 @@ pub async fn new_user<'c>( user: &User, ) -> Result { query!( - r"INSERT INTO users (user_id, username, password_hash, password_salt, password_version) + r"INSERT INTO users (id, username, password_hash, password_salt, password_version) VALUES (?, ?, ?, ?, ?)", - user.user_id, + user.id, user.username(), user.password_hash(), user.password_salt(), @@ -188,12 +188,12 @@ pub async fn update_user<'c>( password_hash = ?, password_salt = ?, password_version = ? - WHERE user_id = ?", + WHERE id = ?", user.username(), user.password_hash(), user.password_salt(), user.password_version(), - user.user_id + user.id ) .execute(conn) .await @@ -205,7 +205,7 @@ pub async fn update_username<'c>( username: &str, ) -> Result { query!( - r"UPDATE users SET username = ? WHERE user_id = ?", + r"UPDATE users SET username = ? WHERE id = ?", username, user_id ) @@ -223,7 +223,7 @@ pub async fn update_password<'c>( password_hash = ?, password_salt = ?, password_version = ? - WHERE user_id = ?", + WHERE id = ?", password.hash(), password.salt(), password.version(), -- cgit v1.2.3