diff options
Diffstat (limited to 'backend/core/src/utils')
| -rw-r--r-- | backend/core/src/utils/calculate_budgets_accrual.rs | 14 | ||||
| -rw-r--r-- | backend/core/src/utils/calculate_category_balance.rs | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/backend/core/src/utils/calculate_budgets_accrual.rs b/backend/core/src/utils/calculate_budgets_accrual.rs index bbc197c..22061ee 100644 --- a/backend/core/src/utils/calculate_budgets_accrual.rs +++ b/backend/core/src/utils/calculate_budgets_accrual.rs @@ -9,7 +9,7 @@ pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUp .iter() .filter(|bu| bu.category_id == category.id) .collect::<Vec<&BudgetUpdate>>(); - budget_updates.sort_by_key(|bu| bu.date); + budget_updates.sort_by_key(|bu| bu.date.clone()); budget_updates.reverse(); let mut budgets_accrual = 0.0_f64; @@ -22,7 +22,7 @@ pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUp } let budget_per_day = budget_update.new_budget as f64 / budget_update.new_period as f64; budgets_accrual += days_on_this_budget as f64 * budget_per_day; - calculated_back_to_date = budget_update.date; + calculated_back_to_date = budget_update.date.clone(); } budgets_accrual.floor() as i64 @@ -78,7 +78,7 @@ mod test { let budget_updates = [BudgetUpdate { id: 0, category_id: 0, - date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()), + date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()), new_budget: 100, new_period: 1, }]; @@ -98,14 +98,14 @@ mod test { BudgetUpdate { id: 0, category_id: 0, - date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(60)).unwrap()), + date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(60)).unwrap()), new_budget: 200, new_period: 1, }, BudgetUpdate { id: 0, category_id: 0, - date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()), + date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()), new_budget: 100, new_period: 1, }, @@ -127,7 +127,7 @@ mod test { id: 0, category_id: 0, date: DateTimeUtc::new( - Utc::now() + &Utc::now() .checked_sub_days(Days::new(120)) .unwrap() .with_hour(13) @@ -140,7 +140,7 @@ mod test { id: 0, category_id: 0, date: DateTimeUtc::new( - Utc::now() + &Utc::now() .checked_sub_days(Days::new(120)) .unwrap() .with_hour(12) diff --git a/backend/core/src/utils/calculate_category_balance.rs b/backend/core/src/utils/calculate_category_balance.rs index 5eca05b..e461cee 100644 --- a/backend/core/src/utils/calculate_category_balance.rs +++ b/backend/core/src/utils/calculate_category_balance.rs @@ -51,7 +51,7 @@ mod test { let budget_updates = [BudgetUpdate { id: 0, category_id: 1, - date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()), + date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()), new_budget: 77, new_period: 1, }]; @@ -123,7 +123,7 @@ mod test { let budget_updates = [BudgetUpdate { id: 0, category_id: 0, - date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()), + date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()), new_budget: 77, new_period: 1, }]; |