Fixed account member DTOs.
This commit is contained in:
@@ -5,7 +5,9 @@ body:
|
|||||||
type: json
|
type: json
|
||||||
content: |-
|
content: |-
|
||||||
{
|
{
|
||||||
"user_id": "00000000-0000-0000-0000-000000000001"
|
"user": {
|
||||||
|
"id":"00000000-0000-0000-0000-000000000001"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
settings: {}
|
settings: {}
|
||||||
order: 3000
|
order: 3000
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use crate::domain;
|
|||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
pub struct AccountMemberRequest {
|
pub struct AccountMemberRequest {
|
||||||
pub user_id: Uuid,
|
pub user: UserRequest,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AccountMemberRequest {
|
impl AccountMemberRequest {
|
||||||
@@ -17,56 +17,68 @@ impl AccountMemberRequest {
|
|||||||
Ok(domain::AccountMember {
|
Ok(domain::AccountMember {
|
||||||
id,
|
id,
|
||||||
account_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)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
pub struct AccountMemberResponse {
|
pub struct AccountMemberResponse {
|
||||||
pub id: Uuid,
|
pub id: Uuid,
|
||||||
pub user_id: Uuid,
|
pub user: UserResponse,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<domain::AccountMember> for AccountMemberResponse {
|
impl From<domain::AccountMember> for AccountMemberResponse {
|
||||||
fn from(member: domain::AccountMember) -> Self {
|
fn from(member: domain::AccountMember) -> Self {
|
||||||
Self {
|
Self {
|
||||||
id: member.id,
|
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)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
fn request() -> AccountMemberRequest {
|
fn request(user_id: Uuid) -> AccountMemberRequest {
|
||||||
AccountMemberRequest {
|
AccountMemberRequest {
|
||||||
user_id: Uuid::nil(),
|
user: UserRequest { id: user_id },
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn serializes_account_member_response() {
|
fn serializes_account_member_response() {
|
||||||
let id = Uuid::new_v4();
|
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();
|
let response = serde_json::to_value(AccountMemberResponse::from(member)).unwrap();
|
||||||
|
|
||||||
assert_eq!(response["id"], id.to_string());
|
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());
|
assert!(response.get("account_id").is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn deserializes_account_member_response_as_request() {
|
fn deserializes_account_member_response_as_request() {
|
||||||
let member = request()
|
let member = request(Uuid::nil())
|
||||||
.into_domain(Uuid::new_v4(), Uuid::new_v4())
|
.into_domain(Uuid::new_v4(), Uuid::new_v4())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let response = serde_json::to_value(AccountMemberResponse::from(member)).unwrap();
|
let response = serde_json::to_value(AccountMemberResponse::from(member)).unwrap();
|
||||||
let request: AccountMemberRequest = serde_json::from_value(response).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]
|
#[test]
|
||||||
@@ -74,15 +86,13 @@ mod tests {
|
|||||||
let id = Uuid::new_v4();
|
let id = Uuid::new_v4();
|
||||||
let account_id = Uuid::new_v4();
|
let account_id = Uuid::new_v4();
|
||||||
let user_id = Uuid::new_v4();
|
let user_id = Uuid::new_v4();
|
||||||
let member = AccountMemberRequest { user_id }
|
let member = request(user_id).into_domain(id, account_id).unwrap();
|
||||||
.into_domain(id, account_id)
|
|
||||||
.unwrap();
|
|
||||||
assert_eq!(member.id, id);
|
assert_eq!(member.id, id);
|
||||||
assert_eq!(member.account_id, account_id);
|
assert_eq!(member.account_id, account_id);
|
||||||
assert_eq!(member.user_id, user_id);
|
assert_eq!(member.user_id, user_id);
|
||||||
|
|
||||||
let response = AccountMemberResponse::from(member);
|
let response = AccountMemberResponse::from(member);
|
||||||
assert_eq!(response.id, id);
|
assert_eq!(response.id, id);
|
||||||
assert_eq!(response.user_id, user_id);
|
assert_eq!(response.user.id, user_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user