From c1d4b0a43046b8aa4bad6ebf6ca3f74aba1bb54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?= Date: Fri, 9 Oct 2020 23:51:37 +0300 Subject: take into account shared expenses --- budget/src/lib.rs | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'budget/src') diff --git a/budget/src/lib.rs b/budget/src/lib.rs index 7d7c390..7d194c0 100644 --- a/budget/src/lib.rs +++ b/budget/src/lib.rs @@ -49,6 +49,7 @@ pub struct Calculated { pub categories_subtotal: HashMap, pub total: f64, pub balance: f64, + pub total_owed: HashMap, pub days_left: f64, pub days_left_essential: f64, pub last_day: NaiveDate, @@ -69,9 +70,6 @@ fn recurring_default() -> bool { } // Parse the dates from toml's Datetime to Chrono's NaiveDate -// Probably unnecessary for now, but since I am planning on using the dates in -// the future to more easily count the days, it would be better to have them in -// a proper format fn deserialize_date<'de, D>(deserializer: D) -> Result where D: Deserializer<'de> { toml::value::Datetime::deserialize(deserializer) @@ -98,7 +96,7 @@ pub fn parse_account(path: &str) -> Result { } pub fn calculate(account: &Account) -> Option { - if account.days.len() < 1 { + if account.days.is_empty() { return None; } @@ -110,6 +108,7 @@ pub fn calculate(account: &Account) -> Option { categories_subtotal: HashMap::::new(), total: 0.0, balance: 0.0, + total_owed: HashMap::::new(), days_left: 0.0, days_left_essential: 0.0, last_day: account.days.last().unwrap().date, @@ -137,6 +136,23 @@ pub fn calculate(account: &Account) -> Option { if account.essential_categories.contains(category) { calculated.essential_subtotal += expense.price; } + + if expense.shared > 1 { + let owed = + expense.price * + (expense.shared as f64 - 1.0) / + expense.shared as f64; + + if let Some(total_owed_by) = + calculated.total_owed.get_mut(&expense.shared) { + *total_owed_by += owed; + } else { + calculated.total_owed.insert( + expense.shared, + owed, + ); + } + } } } } -- cgit v1.2.3