Added optional user name.
This commit is contained in:
@@ -2,4 +2,5 @@ use uuid::Uuid;
|
||||
|
||||
pub struct UserRow {
|
||||
pub id: Uuid,
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ where
|
||||
sqlx::query_as!(
|
||||
UserRow,
|
||||
r#"
|
||||
SELECT id
|
||||
SELECT id, name
|
||||
FROM users
|
||||
ORDER BY id DESC
|
||||
LIMIT $1
|
||||
@@ -38,7 +38,7 @@ where
|
||||
sqlx::query_as!(
|
||||
UserRow,
|
||||
r#"
|
||||
SELECT id
|
||||
SELECT id, name
|
||||
FROM users
|
||||
WHERE id = $1
|
||||
"#,
|
||||
@@ -56,7 +56,7 @@ where
|
||||
sqlx::query_as!(
|
||||
UserRow,
|
||||
r#"
|
||||
SELECT id
|
||||
SELECT id, name
|
||||
FROM users
|
||||
WHERE id = ANY($1)
|
||||
"#,
|
||||
@@ -73,23 +73,32 @@ where
|
||||
{
|
||||
let row = sqlx::query!(
|
||||
r#"
|
||||
INSERT INTO users (id)
|
||||
VALUES ($1)
|
||||
INSERT INTO users (id, name)
|
||||
VALUES ($1, $2)
|
||||
ON CONFLICT (id) DO UPDATE SET
|
||||
id = EXCLUDED.id
|
||||
name = EXCLUDED.name
|
||||
RETURNING WITH (OLD AS old_row, NEW AS new_row)
|
||||
old_row.id AS "old_id?",
|
||||
new_row.id AS "id!"
|
||||
old_row.name AS "old_name?",
|
||||
new_row.id AS "id!",
|
||||
new_row.name AS "name?"
|
||||
"#,
|
||||
user.id,
|
||||
user.name,
|
||||
)
|
||||
.fetch_one(executor)
|
||||
.await
|
||||
.map_err(DatabaseError::from)?;
|
||||
|
||||
Ok(Upsert {
|
||||
previous: row.old_id.map(|id| UserRow { id }),
|
||||
current: UserRow { id: row.id },
|
||||
previous: row.old_id.map(|id| UserRow {
|
||||
id,
|
||||
name: row.old_name,
|
||||
}),
|
||||
current: UserRow {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
@@ -102,7 +111,7 @@ where
|
||||
r#"
|
||||
DELETE FROM users
|
||||
WHERE id = $1
|
||||
RETURNING id
|
||||
RETURNING id, name
|
||||
"#,
|
||||
id
|
||||
)
|
||||
|
||||
@@ -3,4 +3,5 @@ use uuid::Uuid;
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct User {
|
||||
pub id: Uuid,
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
@@ -111,11 +111,17 @@ fn classify_delete_error(error: DatabaseError) -> RepositoryError {
|
||||
}
|
||||
|
||||
fn decode(row: UserRow) -> Result<User, DecodeError> {
|
||||
Ok(User { id: row.id })
|
||||
Ok(User {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
})
|
||||
}
|
||||
|
||||
fn encode(user: User) -> UserRow {
|
||||
UserRow { id: user.id }
|
||||
UserRow {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -153,7 +159,10 @@ mod tests {
|
||||
}
|
||||
|
||||
fn row() -> UserRow {
|
||||
UserRow { id: Uuid::new_v4() }
|
||||
UserRow {
|
||||
id: Uuid::new_v4(),
|
||||
name: Some("Test User".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -163,6 +172,7 @@ mod tests {
|
||||
let user = decode(row).unwrap();
|
||||
|
||||
assert_eq!(user.id, id);
|
||||
assert_eq!(user.name, Some("Test User".to_string()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -37,7 +37,10 @@ impl AccountMemberResponse {
|
||||
pub fn from_domain(member: domain::AccountMember, user: domain::User) -> Self {
|
||||
Self {
|
||||
id: member.id,
|
||||
user: UserResponse { id: user.id },
|
||||
user: UserResponse {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,6 +48,7 @@ impl AccountMemberResponse {
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
pub struct UserResponse {
|
||||
pub id: Uuid,
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -60,12 +64,18 @@ mod tests {
|
||||
fn response(id: Uuid, user: domain::User) -> AccountMemberResponse {
|
||||
AccountMemberResponse {
|
||||
id,
|
||||
user: UserResponse { id: user.id },
|
||||
user: UserResponse {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn user() -> domain::User {
|
||||
domain::User { id: Uuid::nil() }
|
||||
domain::User {
|
||||
id: Uuid::nil(),
|
||||
name: Some("Test User".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -75,6 +85,7 @@ mod tests {
|
||||
|
||||
assert_eq!(response["id"], id.to_string());
|
||||
assert_eq!(response["user"]["id"], Uuid::nil().to_string());
|
||||
assert_eq!(response["user"]["name"], "Test User");
|
||||
assert!(response.get("account_id").is_none());
|
||||
}
|
||||
|
||||
@@ -99,5 +110,6 @@ mod tests {
|
||||
let response = response(id, user());
|
||||
assert_eq!(response.id, id);
|
||||
assert_eq!(response.user.id, Uuid::nil());
|
||||
assert_eq!(response.user.name, Some("Test User".to_string()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,22 +4,31 @@ use uuid::Uuid;
|
||||
use crate::domain;
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
pub struct UserRequest {}
|
||||
pub struct UserRequest {
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
impl UserRequest {
|
||||
pub fn into_domain(self, id: Uuid) -> Result<domain::User, domain::DomainError> {
|
||||
Ok(domain::User { id })
|
||||
Ok(domain::User {
|
||||
id,
|
||||
name: self.name,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
pub struct UserResponse {
|
||||
pub id: Uuid,
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
impl From<domain::User> for UserResponse {
|
||||
fn from(user: domain::User) -> Self {
|
||||
Self { id: user.id }
|
||||
Self {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +37,9 @@ mod tests {
|
||||
use super::*;
|
||||
|
||||
fn request() -> UserRequest {
|
||||
UserRequest {}
|
||||
UserRequest {
|
||||
name: Some("Test User".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -38,13 +49,16 @@ mod tests {
|
||||
let response = serde_json::to_value(UserResponse::from(user)).unwrap();
|
||||
|
||||
assert_eq!(response["id"], id.to_string());
|
||||
assert_eq!(response["name"], "Test User");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn deserializes_user_response_as_request() {
|
||||
let user = request().into_domain(Uuid::nil()).unwrap();
|
||||
let response = serde_json::to_value(UserResponse::from(user)).unwrap();
|
||||
let _request: UserRequest = serde_json::from_value(response).unwrap();
|
||||
let request: UserRequest = serde_json::from_value(response).unwrap();
|
||||
|
||||
assert_eq!(request.name, Some("Test User".to_string()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -52,8 +66,10 @@ mod tests {
|
||||
let id = Uuid::new_v4();
|
||||
let user = request().into_domain(id).unwrap();
|
||||
assert_eq!(user.id, id);
|
||||
assert_eq!(user.name, Some("Test User".to_string()));
|
||||
|
||||
let response = UserResponse::from(user);
|
||||
assert_eq!(response.id, id);
|
||||
assert_eq!(response.name, Some("Test User".to_string()));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user