From b60ce6ee5311df0482485902acb1878a74f0f16f Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 31 May 2026 17:45:05 -0400 Subject: [PATCH] Adding more callers code --- Cargo.lock | 4 +++- Cargo.toml | 2 +- src/callers/register.rs | 15 +++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9015e0f..5e832f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2241,7 +2241,7 @@ dependencies = [ [[package]] name = "textsender_models" version = "0.3.0" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0-17-f920e91ec0-111#f920e91ec07487dbe1a72207a8bd2be84c0e95b9" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0-19-cf112a468d-111#cf112a468d4e653ec49c55bc890d59b730c85f79" dependencies = [ "const_format", "dotenvy", @@ -2250,6 +2250,7 @@ dependencies = [ "serde", "serde_json", "time", + "utoipa", "uuid", ] @@ -2577,6 +2578,7 @@ dependencies = [ "quote", "regex", "syn", + "uuid", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 568a863..e1792ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ time = { version = "0.3.47", features = ["macros", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-17-f920e91ec0-111" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-19-cf112a468d-111" } # icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" } # dotenvy = { version = "0.15.7" } # const_format = { version = "0.2.36" } diff --git a/src/callers/register.rs b/src/callers/register.rs index dc644ff..b435543 100644 --- a/src/callers/register.rs +++ b/src/callers/register.rs @@ -29,7 +29,7 @@ pub mod response { #[derive(Deserialize, Serialize, utoipa::ToSchema)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } } @@ -67,15 +67,14 @@ pub async fn register_user( }; if registration_enabled { - let mut user = icarus_models::user::User { + let mut user = textsender_models::user::User { username: payload.username.clone(), password: payload.password.clone(), - email: payload.email.clone(), - phone: payload.phone.clone(), + // email: payload.email.clone(), + phone_number: payload.phone.clone(), firstname: payload.firstname.clone(), lastname: payload.lastname.clone(), - status: String::from("Active"), - email_verified: true, + // email_verified: true, ..Default::default() }; @@ -91,7 +90,7 @@ pub async fn register_user( ) } else { let salt_string = hashing::generate_salt().unwrap(); - let mut salt = textsender_models::user::salt::Salt::default(); + let mut salt = textsender_models::user::Salt::default(); let generated_salt = salt_string; salt.salt = generated_salt.to_string(); salt.id = repo::salt::insert(&pool, &salt).await.unwrap(); @@ -103,7 +102,7 @@ pub async fn register_user( match repo::user::insert(&pool, &user).await { Ok((id, date_created)) => { user.id = id; - user.date_created = date_created; + user.created = date_created; ( StatusCode::CREATED, Json(response::Response {