0.7.27 +Refactor
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
/// Application-facing trade-event DTO.
|
||||
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
|
||||
pub struct KbTradeEventDto {
|
||||
pub struct TradeEventDto {
|
||||
/// Optional numeric primary key.
|
||||
pub id: std::option::Option<i64>,
|
||||
/// Related DEX id.
|
||||
@@ -22,7 +22,7 @@ pub struct KbTradeEventDto {
|
||||
/// Optional observed slot.
|
||||
pub slot: std::option::Option<i64>,
|
||||
/// Stable trade side.
|
||||
pub trade_side: crate::KbSwapTradeSide,
|
||||
pub trade_side: crate::SwapTradeSide,
|
||||
/// Related base token id.
|
||||
pub base_token_id: i64,
|
||||
/// Related quote token id.
|
||||
@@ -34,7 +34,7 @@ pub struct KbTradeEventDto {
|
||||
/// Optional derived quote-per-base price.
|
||||
pub price_quote_per_base: std::option::Option<f64>,
|
||||
/// Observation source kind.
|
||||
pub source_kind: crate::KbObservationSourceKind,
|
||||
pub source_kind: crate::ObservationSourceKind,
|
||||
/// Optional logical source endpoint name.
|
||||
pub source_endpoint_name: std::option::Option<std::string::String>,
|
||||
/// Persisted payload JSON.
|
||||
@@ -45,7 +45,7 @@ pub struct KbTradeEventDto {
|
||||
pub updated_at: chrono::DateTime<chrono::Utc>,
|
||||
}
|
||||
|
||||
impl KbTradeEventDto {
|
||||
impl TradeEventDto {
|
||||
/// Creates a new trade-event DTO.
|
||||
pub fn new(
|
||||
dex_id: i64,
|
||||
@@ -55,13 +55,13 @@ impl KbTradeEventDto {
|
||||
decoded_event_id: i64,
|
||||
signature: std::string::String,
|
||||
slot: std::option::Option<i64>,
|
||||
trade_side: crate::KbSwapTradeSide,
|
||||
trade_side: crate::SwapTradeSide,
|
||||
base_token_id: i64,
|
||||
quote_token_id: i64,
|
||||
base_amount_raw: std::option::Option<std::string::String>,
|
||||
quote_amount_raw: std::option::Option<std::string::String>,
|
||||
price_quote_per_base: std::option::Option<f64>,
|
||||
source_kind: crate::KbObservationSourceKind,
|
||||
source_kind: crate::ObservationSourceKind,
|
||||
source_endpoint_name: std::option::Option<std::string::String>,
|
||||
payload_json: std::string::String,
|
||||
) -> Self {
|
||||
@@ -90,12 +90,12 @@ impl KbTradeEventDto {
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<crate::KbTradeEventEntity> for KbTradeEventDto {
|
||||
type Error = crate::KbError;
|
||||
impl TryFrom<crate::TradeEventEntity> for TradeEventDto {
|
||||
type Error = crate::Error;
|
||||
|
||||
fn try_from(entity: crate::KbTradeEventEntity) -> Result<Self, Self::Error> {
|
||||
let trade_side = kb_trade_side_from_string(entity.trade_side.as_str());
|
||||
let source_kind_result = crate::KbObservationSourceKind::from_i16(entity.source_kind);
|
||||
fn try_from(entity: crate::TradeEventEntity) -> Result<Self, Self::Error> {
|
||||
let trade_side = trade_side_from_string(entity.trade_side.as_str());
|
||||
let source_kind_result = crate::ObservationSourceKind::from_i16(entity.source_kind);
|
||||
let source_kind = match source_kind_result {
|
||||
Ok(source_kind) => source_kind,
|
||||
Err(error) => return Err(error),
|
||||
@@ -104,7 +104,7 @@ impl TryFrom<crate::KbTradeEventEntity> for KbTradeEventDto {
|
||||
let created_at = match created_at_result {
|
||||
Ok(created_at) => created_at.with_timezone(&chrono::Utc),
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot parse trade_event created_at '{}': {}",
|
||||
entity.created_at, error
|
||||
)));
|
||||
@@ -114,7 +114,7 @@ impl TryFrom<crate::KbTradeEventEntity> for KbTradeEventDto {
|
||||
let updated_at = match updated_at_result {
|
||||
Ok(updated_at) => updated_at.with_timezone(&chrono::Utc),
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot parse trade_event updated_at '{}': {}",
|
||||
entity.updated_at, error
|
||||
)));
|
||||
@@ -144,10 +144,10 @@ impl TryFrom<crate::KbTradeEventEntity> for KbTradeEventDto {
|
||||
}
|
||||
}
|
||||
|
||||
fn kb_trade_side_from_string(value: &str) -> crate::KbSwapTradeSide {
|
||||
fn trade_side_from_string(value: &str) -> crate::SwapTradeSide {
|
||||
match value {
|
||||
"BuyBase" => return crate::KbSwapTradeSide::BuyBase,
|
||||
"SellBase" => return crate::KbSwapTradeSide::SellBase,
|
||||
_ => return crate::KbSwapTradeSide::Unknown,
|
||||
"BuyBase" => return crate::SwapTradeSide::BuyBase,
|
||||
"SellBase" => return crate::SwapTradeSide::SellBase,
|
||||
_ => return crate::SwapTradeSide::Unknown,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user