diff --git a/Cargo.toml b/Cargo.toml index 3c43456..63cbea3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,8 +31,7 @@ openssl = { version = "0", features = ["vendored"] } prost = { version = "0" } reqwest = { version = "0", features = ["json"] } serde = { version = "1", features = ["derive"] } -serde_bytes = { version = "0" } -serde_json = { version = "1" } +serde_json = { version = "1", features = ["raw_value"] } tokio = { version = "1", features = ["macros", "rt-multi-thread"] } tokio-cron-scheduler = { version = "0" } uuid = { version = "0", features = ["serde", "v4", "v5"] } diff --git a/src/api/betting/models.rs b/src/api/betting/models.rs index 4252bb8..69dd378 100644 --- a/src/api/betting/models.rs +++ b/src/api/betting/models.rs @@ -36,8 +36,7 @@ pub struct Betting { #[serde(rename = "groupKey")] pub group_key: Option, /// 게임 데이터 - #[serde(with = "serde_bytes")] - pub detail: Option>, + pub detail: Option, /// 보너스 여부 #[serde(rename = "isBonus")] pub is_bonus: bool, diff --git a/src/api/member_account/api.rs b/src/api/member_account/api.rs index c44f8b3..e63b30f 100644 --- a/src/api/member_account/api.rs +++ b/src/api/member_account/api.rs @@ -70,15 +70,7 @@ impl Api { let balance_bota = r.balance_bota.unwrap_or(0.00); let balance_sum = r.balance_sum.unwrap_or(0.00); let companies = match r.companies { - Some(v) => match std::str::from_utf8(v.as_slice()) { - Ok(v) => Some(v.to_string()), - Err(e) => { - return Err(Error { - code: -1, - msg: Some(e.to_string()), - }); - } - }, + Some(v) => v.as_str().map(|ss| ss.to_string()), None => None, }; diff --git a/src/api/member_account/models.rs b/src/api/member_account/models.rs index 03c5e2e..af0f806 100644 --- a/src/api/member_account/models.rs +++ b/src/api/member_account/models.rs @@ -13,8 +13,7 @@ pub struct _GetBalanceForUserResponse { pub balance_bota: Option, #[serde(rename = "balanceSum")] pub balance_sum: Option, - #[serde(with = "serde_bytes")] - pub companies: Option>, + pub companies: Option, } #[derive(Serialize, Deserialize, Debug)] diff --git a/src/synchronizations/betting_history/synchronizer.rs b/src/synchronizations/betting_history/synchronizer.rs index f45319c..b9042b3 100644 --- a/src/synchronizations/betting_history/synchronizer.rs +++ b/src/synchronizations/betting_history/synchronizer.rs @@ -138,15 +138,7 @@ impl Synchronizer { } }; let detail = match b.detail { - Some(v) => match std::str::from_utf8(v.as_slice()) { - Ok(v) => Some(v.to_string()), - Err(e) => { - return Err(api::core::models::Error { - code: -1, - msg: Some(format!("std::str::from_utf8 error: {}", e)), - }); - } - }, + Some(v) => v.as_str().map(|ss| ss.to_string()), None => None, };