refactor: separate model and controller

1 files changed, 5 insertions, 11 deletions

diff --git a/src/routes/signup.rs b/src/routes/signup.rs
index ae10201..bb1f714 100644
--- a/src/routes/signup.rs
+++ b/src/routes/signup.rs
@@ -1,11 +1,12 @@
 use actix_web::{get, post, web, HttpResponse};
 use serde::Deserialize;
 
+use crate::error::PinussyError;
 use crate::notification::{Kind as NotificationKind, Notification};
 use crate::templates;
+use crate::users::User;
 use crate::Pinussy;
 use crate::Result;
-use bcrypt::{hash, DEFAULT_COST};
 
 #[get("/signup")]
 async fn get() -> HttpResponse {
@@ -20,15 +21,8 @@ struct SignupForm {
 
 #[post("/signup")]
 async fn post(state: web::Data<Pinussy>, form: web::Form<SignupForm>) -> Result<HttpResponse> {
-    let password_hash = hash(&form.password, DEFAULT_COST)?;
-    match sqlx::query!(
-        "insert into users(username, password) values ($1, $2)",
-        &form.username,
-        password_hash
-    )
-    .execute(&state.db)
-    .await
-    {
+    let new_user = User::new(form.username.clone(), form.password.clone())?;
+    match state.db.users().create(new_user).await {
         Ok(_) => {
             return Ok(HttpResponse::Ok().body(
                 render!(
@@ -43,7 +37,7 @@ async fn post(state: web::Data<Pinussy>, form: web::Form<SignupForm>) -> Result<
         }
         Err(e) => {
             match e {
-                sqlx::Error::Database(e) => {
+                PinussyError::Database(sqlx::Error::Database(e)) => {
                     if e.is_unique_violation() {
                         return Ok(HttpResponse::Conflict().body(
                             render!(