From fd2afc6ae91697cad4aed7f0e04959715140870d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wo=C5=BAniak?= Date: Fri, 10 Jun 2022 15:15:12 +0200 Subject: [PATCH] Set order account id as optional --- actors/database_manager/src/orders.rs | 2 ++ shared/model/src/api.rs | 2 +- shared/model/src/lib.rs | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/actors/database_manager/src/orders.rs b/actors/database_manager/src/orders.rs index 17621bc..49d1e3a 100644 --- a/actors/database_manager/src/orders.rs +++ b/actors/database_manager/src/orders.rs @@ -239,7 +239,9 @@ WHERE id = $1 #[derive(actix::Message)] #[rtype(result = "Result")] pub struct SetOrderServiceId { + /// Internal order id pub id: OrderId, + /// Payment external service id pub service_order_id: String, } diff --git a/shared/model/src/api.rs b/shared/model/src/api.rs index 72a75c1..2199fa7 100644 --- a/shared/model/src/api.rs +++ b/shared/model/src/api.rs @@ -167,7 +167,7 @@ impl From<(crate::Order, Vec)> for Order { #[derive(Serialize, Deserialize, Debug)] pub struct Order { pub id: crate::OrderId, - pub buyer_id: crate::AccountId, + pub buyer_id: Option, pub status: crate::OrderStatus, pub items: Vec, pub checkout_notes: Option, diff --git a/shared/model/src/lib.rs b/shared/model/src/lib.rs index 7f4b9cd..572b7f5 100644 --- a/shared/model/src/lib.rs +++ b/shared/model/src/lib.rs @@ -934,11 +934,17 @@ impl ExtOrderId { #[derive(Debug, PartialEq, Serialize, Deserialize)] pub struct Order { pub id: OrderId, - pub buyer_id: AccountId, + /// Optional customer account id + pub buyer_id: Option, + /// Order status pub status: OrderStatus, + /// ID send to external payment service as an identifier pub order_ext_id: uuid::Uuid, + /// ID received from external payment service as an identifier pub service_order_id: Option, + /// Optional notes given by customer pub checkout_notes: Option, + /// Delivery address pub address_id: OrderAddressId, } @@ -947,7 +953,7 @@ pub struct Order { #[derive(Serialize, Deserialize)] pub struct PublicOrder { pub id: OrderId, - pub buyer_id: AccountId, + pub buyer_id: Option, pub status: OrderStatus, pub checkout_notes: String, pub address_id: OrderAddressId,