Merge pull request #67 from mfirhas/master

Format conversion response

Author: mfirhas

Cargo.lock

@@ -28,6 +28,8 @@ regex = "1"
 async-trait = "0.1"
 rand = "0.8"
 
+accounting = { version = "0.2.0", features = ["decimal"] }
+
 # log = "0.4"
 # pretty_env_logger = "0.4"
 # sentry = "0.29.0"

Cargo.toml

@@ -12,6 +12,7 @@ use crate::commands::Args;
 use crate::deps::http_client::http_client;
 use crate::error::{AsInternalError, HandlerError};
 use crate::handlers::forex::{ConvertResponseData, ForexResp};
+use crate::utils::money::format_money_str;
 
 // format of a currency code: USD, IDR, BTC, XAU. Case insensitive.
 static CURRENCY_FORMAT: LazyLock<Regex> =
@@ -175,11 +176,12 @@ impl Display for ConvertResponse {
                                 .cloned()
                                 .unwrap_or(ZERO_AMOUNT.into());
 
+                            let from_fmt = format_money_str(&from_currency, &from_amount);
+
                             format!(
-                                "Conversion on {}:\n<b>{} {} = {}</b>",
+                                "Conversion on {}:\n<b>{} = {}</b>",
                                 data.date.format("%Y-%m-%d %H:%M:%S %:z").to_string(),
-                                from_currency,
-                                from_amount,
+                                from_fmt,
                                 data.code,
                             )
                         }

src/handlers/convert.rs

@@ -17,6 +17,7 @@ mod config;
 mod deps;
 mod error;
 mod handlers;
+mod utils;
 use config::config;
 
 static WEBHOOK_ENDPOINT: &'static str = "https://api.mfirhas.com/webhook";

src/main.rs

@@ -0,0 +1 @@
+pub(crate) mod money;

src/utils/mod.rs

@@ -0,0 +1,16 @@
+use std::str::FromStr;
+
+use accounting::Accounting;
+use rust_decimal::Decimal;
+use rust_decimal_macros::dec;
+
+pub fn format_money_str(code: &str, money_str: &str) -> String {
+    let mut ac = Accounting::new_from_seperator(code, 2, ",", ".");
+
+    ac.set_format("{s} {v}");
+
+    let amount = Decimal::from_str(money_str).unwrap_or(dec!(0));
+    let money_display = ac.format_money(amount);
+
+    money_display
+}