Fixed account member DTOs.

This commit is contained in:
2026-10-12 13:15:07 +02:00
parent e963947bf8
commit d2993eafe0
2 changed files with 27 additions and 15 deletions
@@ -5,7 +5,9 @@ body:
type: json
content: |-
{
"user_id": "00000000-0000-0000-0000-000000000001"
"user": {
"id":"00000000-0000-0000-0000-000000000001"
}
}
settings: {}
order: 3000
+24 -14
View File
@@ -5,7 +5,7 @@ use crate::domain;
#[derive(Debug, Clone, Deserialize)]
pub struct AccountMemberRequest {
pub user_id: Uuid,
pub user: UserRequest,
}
impl AccountMemberRequest {
@@ -17,56 +17,68 @@ impl AccountMemberRequest {
Ok(domain::AccountMember {
id,
account_id,
user_id: self.user_id,
user_id: self.user.id,
})
}
}
#[derive(Debug, Clone, Deserialize)]
pub struct UserRequest {
pub id: Uuid,
}
#[derive(Debug, Clone, Serialize)]
pub struct AccountMemberResponse {
pub id: Uuid,
pub user_id: Uuid,
pub user: UserResponse,
}
impl From<domain::AccountMember> for AccountMemberResponse {
fn from(member: domain::AccountMember) -> Self {
Self {
id: member.id,
user_id: member.user_id,
user: UserResponse { id: member.user_id },
}
}
}
#[derive(Debug, Clone, Serialize)]
pub struct UserResponse {
pub id: Uuid,
}
#[cfg(test)]
mod tests {
use super::*;
fn request() -> AccountMemberRequest {
fn request(user_id: Uuid) -> AccountMemberRequest {
AccountMemberRequest {
user_id: Uuid::nil(),
user: UserRequest { id: user_id },
}
}
#[test]
fn serializes_account_member_response() {
let id = Uuid::new_v4();
let member = request().into_domain(id, Uuid::new_v4()).unwrap();
let member = request(Uuid::nil())
.into_domain(id, Uuid::new_v4())
.unwrap();
let response = serde_json::to_value(AccountMemberResponse::from(member)).unwrap();
assert_eq!(response["id"], id.to_string());
assert_eq!(response["user_id"], Uuid::nil().to_string());
assert_eq!(response["user"]["id"], Uuid::nil().to_string());
assert!(response.get("account_id").is_none());
}
#[test]
fn deserializes_account_member_response_as_request() {
let member = request()
let member = request(Uuid::nil())
.into_domain(Uuid::new_v4(), Uuid::new_v4())
.unwrap();
let response = serde_json::to_value(AccountMemberResponse::from(member)).unwrap();
let request: AccountMemberRequest = serde_json::from_value(response).unwrap();
assert_eq!(request.user_id, Uuid::nil());
assert_eq!(request.user.id, Uuid::nil());
}
#[test]
@@ -74,15 +86,13 @@ mod tests {
let id = Uuid::new_v4();
let account_id = Uuid::new_v4();
let user_id = Uuid::new_v4();
let member = AccountMemberRequest { user_id }
.into_domain(id, account_id)
.unwrap();
let member = request(user_id).into_domain(id, account_id).unwrap();
assert_eq!(member.id, id);
assert_eq!(member.account_id, account_id);
assert_eq!(member.user_id, user_id);
let response = AccountMemberResponse::from(member);
assert_eq!(response.id, id);
assert_eq!(response.user_id, user_id);
assert_eq!(response.user.id, user_id);
}
}