add even more fields to user schema

migrations/20221206184956_create_users.sql

@@ -3,7 +3,9 @@ CREATE TABLE users (
     account_id BIGINT REFERENCES accounts (id),
     email VARCHAR NOT NULL,
     password VARCHAR NOT NULL,
-    activated BOOLEAN NOT NULL DEFAULT FALSE
+    reason VARCHAR DEFAULT NULL,
+    activated BOOLEAN NOT NULL DEFAULT FALSE,
+    locale VARCHAR NOT NULL
 );
 
 CREATE UNIQUE INDEX index_users_on_email ON users (email);

src/data/user/pg.rs

@@ -13,11 +13,7 @@ impl PgUserDataSource {
         PgUserDataSource { pool }
     }
 
-    pub async fn by_id<I>(&self, id: I) -> Result<User>
+    pub async fn by_id(&self, id: Id) -> Result<User> {
-    where
-        I: Into<Id> + Send,
-    {
-        let id: Id = id.into();
         let user: User = sqlx::query_as("SELECT * FROM users WHERE id = $1")
             .bind(id)
             .fetch_one(&self.pool)
@@ -25,30 +21,35 @@ impl PgUserDataSource {
         Ok(user)
     }
 
-    pub async fn by_account<I>(&self, account_id: I) -> Result<User>
+    pub async fn by_account(&self, account_id: Id) -> Result<User> {
-    where
-        I: Into<Id> + Send,
-    {
-        let id: Id = account_id.into();
         let user: User = sqlx::query_as("SELECT * FROM users WHERE account_id = $1")
-            .bind(id)
+            .bind(account_id)
             .fetch_one(&self.pool)
             .await?;
         Ok(user)
     }
 
-    pub async fn create<T>(&self, new: T) -> Result<User>
+    pub async fn by_email(&self, email: &str) -> Result<User> {
-    where
+        let user: User = sqlx::query_as("SELECT * FROM users WHERE email = $1")
-        T: Into<NewUser> + Send,
+            .bind(email)
-    {
+            .fetch_one(&self.pool)
-        let new = new.into();
+            .await?;
-        let user: User =
+        Ok(user)
-            sqlx::query_as("INSERT INTO users (account_id, email, password) VALUES ($1, $2, $3)")
+    }
-                .bind(new.account_id)
+
-                .bind(new.email)
+    pub async fn create(&self, new: NewUser) -> Result<User> {
-                .bind(new.password)
+        let user: User = sqlx::query_as(
-                .fetch_one(&self.pool)
+            "INSERT INTO users (account_id, email, password, reason, locale) \
-                .await?;
+            VALUES ($1, $2, $3, $4, $5) \
+            RETURNING *",
+        )
+        .bind(new.account_id)
+        .bind(new.email)
+        .bind(new.password)
+        .bind(new.reason)
+        .bind(new.locale)
+        .fetch_one(&self.pool)
+        .await?;
         Ok(user)
     }
 }

src/model/user.rs

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
 
 use crate::core::*;
+use crate::util::validate::{ResultBuilder, Validate};
 
 #[derive(Deserialize, Serialize, FromRow)]
 pub struct User {
@@ -9,12 +10,17 @@ pub struct User {
     pub account_id: Id,
     pub email: String,
     pub password: String,
+    pub reason: Option<String>,
+    pub locale: String,
+    pub activated: bool,
 }
 
 pub struct NewUser {
     pub account_id: Id,
     pub email: String,
     pub password: String,
+    pub reason: Option<String>,
+    pub locale: String,
 }
 
 impl From<User> for Id {
@@ -22,3 +28,11 @@ impl From<User> for Id {
         user.id
     }
 }
+
+impl Validate for NewUser {
+    fn validate(&self, builder: ResultBuilder) -> ResultBuilder {
+        builder.field(&self.email, "email", |f| {
+            f.check("Email must not be empty", |v| v.len() > 0)
+        })
+    }
+}

src/repo/user.rs

@@ -19,20 +19,30 @@ impl UserRepo {
     where
         I: Into<Id> + Send,
     {
-        self.db.by_id(id).await
+        self.db.by_id(id.into()).await
     }
 
     pub async fn by_account<I>(&self, account_id: I) -> Result<User>
     where
         I: Into<Id> + Send,
     {
-        self.db.by_account(account_id).await
+        self.db.by_account(account_id.into()).await
     }
 
-    pub async fn create<T>(&self, new: T) -> Result<User>
+    pub async fn by_email<T>(&self, email: T) -> Result<User>
     where
-        T: Into<NewUser> + Send,
+        T: AsRef<str>,
     {
-        self.db.create(new).await
+        self.db.by_email(email.as_ref()).await
+    }
+
+    pub async fn create<T, E>(&self, new: T) -> Result<User>
+    where
+        T: TryInto<Sane<NewUser>, Error = E> + Send,
+        E: Into<Error>,
+    {
+        self.db
+            .create(new.try_into().map_err(|e| e.into())?.inner())
+            .await
     }
 }