diff options
Diffstat (limited to 'rust/schist_queries/src')
| -rw-r--r-- | rust/schist_queries/src/budget_drips.rs | 40 | ||||
| -rw-r--r-- | rust/schist_queries/src/budget_updates.rs | 74 | ||||
| -rw-r--r-- | rust/schist_queries/src/categories.rs | 108 | ||||
| -rw-r--r-- | rust/schist_queries/src/clear.rs | 9 | ||||
| -rw-r--r-- | rust/schist_queries/src/lib.rs | 2 | ||||
| -rw-r--r-- | rust/schist_queries/src/utils/calculate_budgets_accrual.rs | 150 | ||||
| -rw-r--r-- | rust/schist_queries/src/utils/calculate_category_balance.rs | 74 | ||||
| -rw-r--r-- | rust/schist_queries/src/utils/mod.rs | 3 |
8 files changed, 107 insertions, 353 deletions
diff --git a/rust/schist_queries/src/budget_drips.rs b/rust/schist_queries/src/budget_drips.rs new file mode 100644 index 0000000..b6f9372 --- /dev/null +++ b/rust/schist_queries/src/budget_drips.rs @@ -0,0 +1,40 @@ +use anyhow::{Context, Result}; +use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; +use schist_models::budget_drip::BudgetDrip; +use schist_schema::schema::budget_drips::dsl::budget_drips as budget_drips_table; + +pub fn delete_all_budget_drips(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(budget_drips_table) + .execute(connection) + .with_context(|| "failed to delete all budget drips")?; + Ok(num_rows_deleted) +} + +pub fn get_all_budget_drips(connection: &mut SqliteConnection) -> Result<Vec<BudgetDrip>> { + let all_budget_drips = budget_drips_table.select(BudgetDrip::as_select()) + .load(connection) + .with_context(|| "failed to get all budget drips")?; + Ok(all_budget_drips) +} + +pub fn insert_budget_drips( + budget_drips: &[BudgetDrip], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_budget_drips_inserted = diesel::insert_into(budget_drips_table) + .values(budget_drips) + .execute(connection) + .with_context(|| insert_err_msg(budget_drips))?; + Ok(num_budget_drips_inserted) +} + +fn insert_err_msg(budget_drips: &[BudgetDrip]) -> String { + format!( + "failed to insert budget drips: [{}]", + budget_drips + .iter() + .map(|a| a.id.to_string()) + .collect::<Vec<String>>() + .join(", ") + ) +} diff --git a/rust/schist_queries/src/budget_updates.rs b/rust/schist_queries/src/budget_updates.rs deleted file mode 100644 index 07d4808..0000000 --- a/rust/schist_queries/src/budget_updates.rs +++ /dev/null @@ -1,74 +0,0 @@ -use anyhow::{Context, Result}; -use diesel::{dsl::max, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; -use schist_models::{budget_update::BudgetUpdate, date_utc::DateUtc}; -use schist_schema::schema::budget_updates::{ - self as budget_updates_schema, dsl::budget_updates as budget_updates_table, -}; -use schist_traits::nowlike::Nowlike; - -pub fn delete_all_budget_updates(connection: &mut SqliteConnection) -> Result<usize> { - let num_rows_deleted = diesel::delete(budget_updates_table) - .execute(connection) - .with_context(|| "failed to delete all budget updates")?; - Ok(num_rows_deleted) -} - -pub fn get_all_budget_updates( - connection: &mut SqliteConnection, -) -> Result<Vec<BudgetUpdate>> { - let all_budget_updates = budget_updates_table - .select(BudgetUpdate::as_select()) - .load::<BudgetUpdate>(connection) - .with_context(|| "failed to get all budget updates")?; - Ok(all_budget_updates) -} - -pub fn get_first_budget_update_with_date_and_category_id( - date: &DateUtc, - category_id: i32, - connection: &mut SqliteConnection, -) -> Result<Option<BudgetUpdate>> { - let first_budget_update = budget_updates_table - .select(BudgetUpdate::as_select()) - .filter(budget_updates_schema::date.eq(date.to_string())) - .filter(budget_updates_schema::category_id.eq(category_id)) - .first(connection) - .optional() - .with_context(|| format!("failed to get first budget update with date {}", date.to_string()))?; - Ok(first_budget_update) -} - -pub fn get_most_recent_budget_update_date_with_category_id( - category_id: i32, - connection: &mut SqliteConnection, -) -> Result<Option<DateUtc>> { - let most_recent_date = budget_updates_table - .select(max(budget_updates_schema::date)) - .filter(budget_updates_schema::category_id.eq(category_id)) - .filter(budget_updates_schema::date.le(DateUtc::now())) - .first(connection) - .with_context(|| format!("failed to get most recent budget update date with category ID {}", category_id))?; - Ok(most_recent_date) -} - -pub fn insert_budget_updates( - budget_updates: &[BudgetUpdate], - connection: &mut SqliteConnection, -) -> Result<usize> { - let num_rows_inserted = diesel::insert_into(budget_updates_table) - .values(budget_updates) - .execute(connection) - .with_context(|| insert_err_msg(budget_updates))?; - Ok(num_rows_inserted) -} - -fn insert_err_msg(budget_updates: &[BudgetUpdate]) -> String { - format!( - "failed to insert budget updates: [{}]", - budget_updates - .iter() - .map(|a| a.id.to_string()) - .collect::<Vec<String>>() - .join(", ") - ) -} diff --git a/rust/schist_queries/src/categories.rs b/rust/schist_queries/src/categories.rs index f54373c..f4a9747 100644 --- a/rust/schist_queries/src/categories.rs +++ b/rust/schist_queries/src/categories.rs @@ -1,22 +1,8 @@ use anyhow::{Context, Result}; use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; -use schist_models::{budget::Budget, category::Category, category_balance::CategoryBalance, category_budget::CategoryBudget, date_utc::DateUtc}; +use schist_models::category::Category; use schist_schema::schema::categories::{self as categories_schema, dsl::categories as categories_table}; -use crate::{ - budget_updates::{ - get_all_budget_updates, - get_first_budget_update_with_date_and_category_id, - get_most_recent_budget_update_date_with_category_id, - }, - category_transfers::{ - sum_category_transfer_quantity_per_from_category_id, - sum_category_transfer_quantity_per_to_category_id, - }, - transaction_categorisations::sum_transaction_categorisation_quantity_per_category_id, - utils::calculate_category_balance, -}; - pub fn delete_all_categories(connection: &mut SqliteConnection) -> Result<usize> { let num_rows_deleted = diesel::delete(categories_table) .execute(connection) @@ -32,42 +18,6 @@ pub fn get_all_categories(connection: &mut SqliteConnection) -> Result<Vec<Categ Ok(all_categories) } -pub fn get_all_category_balances( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBalance>> { - get_all_category_balances_without_context(connection) - .with_context(|| "failed to get all category balances") -} - -fn get_all_category_balances_without_context( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBalance>> { - let categories = get_all_categories(connection)?; - let transaction_sums = sum_transaction_categorisation_quantity_per_category_id(connection)?; - let category_transfer_from_sums = - sum_category_transfer_quantity_per_from_category_id(connection)?; - let category_transfer_to_sums = sum_category_transfer_quantity_per_to_category_id(connection)?; - let budget_updates = get_all_budget_updates(connection)?; - - let mut balances = Vec::<CategoryBalance>::new(); - for category in categories { - let balance = calculate_category_balance( - &category, - &transaction_sums, - &category_transfer_from_sums, - &category_transfer_to_sums, - &budget_updates, - )?; - - balances.push(CategoryBalance { - category_id: category.id, - balance: balance.try_into().unwrap(), - }) - } - - Ok(balances) -} - pub fn get_all_category_ids(connection: &mut SqliteConnection) -> Result<Vec<i32>> { let all_category_ids = categories_table .select(categories_schema::id) @@ -76,62 +26,6 @@ pub fn get_all_category_ids(connection: &mut SqliteConnection) -> Result<Vec<i32 Ok(all_category_ids) } -pub fn get_most_recent_category_budget_per_category_id( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBudget>> { - get_most_recent_category_budget_per_category_id_without_context(connection) - .with_context(|| "failed to get most recent category budget per category ID") -} - -fn get_most_recent_category_budget_per_category_id_without_context( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBudget>> { - let category_ids: Vec<i32> = get_all_category_ids(connection)?; - - let mut budgets = Vec::<CategoryBudget>::new(); - for category_id in category_ids { - let most_recent_budget_update_date = - get_most_recent_budget_update_date_with_category_id(category_id, connection)?; - - budgets.push(match most_recent_budget_update_date { - None => CategoryBudget { - category_id, - budget: Option::None, - }, - Some(most_recent_budget_update_date) => - get_most_recent_category_budget_with_date_and_category_id( - &most_recent_budget_update_date, - category_id, - connection, - )?, - }) - } - - Ok(budgets) -} - -fn get_most_recent_category_budget_with_date_and_category_id( - most_recent_budget_update_date: &DateUtc, - category_id: i32, - connection: &mut SqliteConnection -) -> Result<CategoryBudget> { - let most_recent_budget_update = get_first_budget_update_with_date_and_category_id( - &most_recent_budget_update_date, - category_id, - connection, - )?; - - let budget = match most_recent_budget_update { - None => None, - Some(most_recent_budget_update) => Some(Budget::from(&most_recent_budget_update)), - }; - - Ok(CategoryBudget { - category_id, - budget, - }) -} - pub fn insert_categories( categories: &[Category], connection: &mut SqliteConnection, diff --git a/rust/schist_queries/src/clear.rs b/rust/schist_queries/src/clear.rs index c823bcc..7cee699 100644 --- a/rust/schist_queries/src/clear.rs +++ b/rust/schist_queries/src/clear.rs @@ -2,17 +2,12 @@ use anyhow::Result; use diesel::SqliteConnection; use crate::{ - accounts::delete_all_accounts, - budget_updates::delete_all_budget_updates, - categories::delete_all_categories, - category_transfers::delete_all_category_transfers, - transactions::delete_all_transactions, - transaction_categorisations::delete_all_transaction_categorisations, + accounts::delete_all_accounts, budget_drips::delete_all_budget_drips, categories::delete_all_categories, category_transfers::delete_all_category_transfers, transaction_categorisations::delete_all_transaction_categorisations, transactions::delete_all_transactions }; pub fn clear(connection: &mut SqliteConnection) -> Result<()> { delete_all_accounts(connection)?; - delete_all_budget_updates(connection)?; + delete_all_budget_drips(connection)?; delete_all_categories(connection)?; delete_all_category_transfers(connection)?; delete_all_transactions(connection)?; diff --git a/rust/schist_queries/src/lib.rs b/rust/schist_queries/src/lib.rs index 3cae464..941b219 100644 --- a/rust/schist_queries/src/lib.rs +++ b/rust/schist_queries/src/lib.rs @@ -1,5 +1,5 @@ pub mod accounts; -pub mod budget_updates; +pub mod budget_drips; pub mod categories; pub mod category_transfers; pub mod clear; diff --git a/rust/schist_queries/src/utils/calculate_budgets_accrual.rs b/rust/schist_queries/src/utils/calculate_budgets_accrual.rs index 1d4ed02..ca82953 100644 --- a/rust/schist_queries/src/utils/calculate_budgets_accrual.rs +++ b/rust/schist_queries/src/utils/calculate_budgets_accrual.rs @@ -1,156 +1,72 @@ use anyhow::Result; use schist_models::{ - budget_update::BudgetUpdate, category::Category, date_utc::DateUtc, + budget_drip::BudgetDrip, + category::Category, }; -use schist_traits::nowlike::Nowlike; -pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUpdate]) -> Result<i64> { - let mut budget_updates = budget_updates +pub fn calculate_budgets_accrual(category: &Category, budget_drips: &[BudgetDrip]) -> Result<i64> { + Ok(budget_drips .iter() - .filter(|bu| bu.category_id == category.id) - .collect::<Vec<&BudgetUpdate>>(); - budget_updates.sort_by_key(|bu| bu.date.clone()); - budget_updates.reverse(); - - let mut budgets_accrual = 0.0_f64; - let mut calculated_back_to_date = DateUtc::now(); - - for budget_update in budget_updates { - let days_on_this_budget = calculated_back_to_date.day_diff(&budget_update.date); - if days_on_this_budget == 0_u32 { - return Err(anyhow::Error::msg(format!( - "failed to calculate budgets accrual since two budget updates had the same date ({})", - budget_update.date, - ))); - } - 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.clone(); - } - - Ok(budgets_accrual.floor() as i64) + .filter(|bd| bd.category_id == category.id) + .map(|bd| Into::<i64>::into(bd.quantity)) + .sum() + ) } #[cfg(test)] mod test { - use chrono::{Days, Utc}; - use schist_models::{budget_update::BudgetUpdate, category::Category, date_utc::DateUtc}; - use schist_traits::nowlike::Nowlike; + use schist_fakes::{budget_drip::make_fake_budget_drip_builder, category::make_fake_category}; use super::calculate_budgets_accrual; #[test] - fn when_no_budget_updates_then_return_zero() { - let category = Category { - id: 0, - name: String::from("Groceries"), - }; - let budget_updates = []; + fn when_no_budget_drips_then_return_zero() { + let category = make_fake_category(0); + let budget_drips = []; - let result = calculate_budgets_accrual(&category, &budget_updates); + let result = calculate_budgets_accrual(&category, &budget_drips); assert!(result.is_ok()); assert_eq!(result.unwrap(), 0_i64); } #[test] - fn when_one_budget_update_for_another_category_then_return_zero() { - let category = Category { - id: 0, - name: String::from("Groceries"), - }; - let budget_updates = [BudgetUpdate { - id: 0, - category_id: 1, - date: DateUtc::now(), - new_budget: 100, - new_period: 1, - }]; + fn when_one_budget_drip_for_another_category_then_return_zero() { + let category = make_fake_category(0); + let budget_drips = [ + make_fake_budget_drip_builder(0).quantity(100).category_id(1).build().unwrap(), + ]; - let result = calculate_budgets_accrual(&category, &budget_updates); + let result = calculate_budgets_accrual(&category, &budget_drips); assert!(result.is_ok()); assert_eq!(result.unwrap(), 0_i64); } #[test] - fn when_one_budget_update_then_return_quantity_times_days_in_past() { - let category = Category { - id: 0, - name: String::from("Groceries"), - }; - let budget_updates = [BudgetUpdate { - id: 0, - category_id: 0, - date: DateUtc::from(Utc::now().checked_sub_days(Days::new(120)).unwrap()), - new_budget: 100, - new_period: 1, - }]; - - let result = calculate_budgets_accrual(&category, &budget_updates); - - assert!(result.is_ok()); - assert_eq!(result.unwrap(), 12_000); - } - - #[test] - fn when_two_budget_updates_then_calculates_as_expected() { - let category = Category { - id: 0, - name: String::from("Groceries"), - }; - let budget_updates = [ - BudgetUpdate { - id: 0, - category_id: 0, - date: DateUtc::from(&Utc::now().checked_sub_days(Days::new(60)).unwrap()), - new_budget: 200, - new_period: 1, - }, - BudgetUpdate { - id: 0, - category_id: 0, - date: DateUtc::from(&Utc::now().checked_sub_days(Days::new(120)).unwrap()), - new_budget: 100, - new_period: 1, - }, + fn when_one_budget_drip_then_return_quantity() { + let category = make_fake_category(0); + let budget_drips = [ + make_fake_budget_drip_builder(0).quantity(100).category_id(0).build().unwrap(), ]; - let result = calculate_budgets_accrual(&category, &budget_updates); + let result = calculate_budgets_accrual(&category, &budget_drips); assert!(result.is_ok()); - assert_eq!(result.unwrap(), 18_000); + assert_eq!(result.unwrap(), 100); } #[test] - fn when_two_budget_updates_on_same_day_then_returns_err() { - let category = Category { - id: 0, - name: String::from("Groceries"), - }; - let budget_updates = [ - BudgetUpdate { - id: 0, - category_id: 0, - date: DateUtc::from_ymd(2020, 12, 25).unwrap(), - new_budget: 200, - new_period: 1, - }, - BudgetUpdate { - id: 0, - category_id: 0, - date: DateUtc::from_ymd(2020, 12, 25).unwrap(), - new_budget: 100, - new_period: 1, - }, + fn when_two_budget_drips_then_return_sum() { + let category = make_fake_category(0); + let budget_drips = [ + make_fake_budget_drip_builder(0).quantity(100).category_id(0).build().unwrap(), + make_fake_budget_drip_builder(1).quantity(120).category_id(0).build().unwrap(), ]; - let mut budget_updates_reversed = budget_updates.clone(); - budget_updates_reversed.reverse(); - let result_leftways = calculate_budgets_accrual(&category, &budget_updates); - let result_rightways = calculate_budgets_accrual(&category, &budget_updates_reversed); + let result = calculate_budgets_accrual(&category, &budget_drips); - assert!(result_leftways.is_err()); - assert!(result_rightways.is_err()); + assert!(result.is_ok()); + assert_eq!(result.unwrap(), 220); } } diff --git a/rust/schist_queries/src/utils/calculate_category_balance.rs b/rust/schist_queries/src/utils/calculate_category_balance.rs index acb56fb..73e80cd 100644 --- a/rust/schist_queries/src/utils/calculate_category_balance.rs +++ b/rust/schist_queries/src/utils/calculate_category_balance.rs @@ -1,19 +1,19 @@ use anyhow::Result; -use schist_models::{budget_update::BudgetUpdate, category::Category}; +use schist_models::{budget_drip::BudgetDrip, category::Category}; -use super::{calculate_budgets_accrual::calculate_budgets_accrual, find_by_id_or::find_by_id_or}; +use super::{calculate_budgets_accrual, find_by_id_or}; pub fn calculate_category_balance( category: &Category, transaction_sums: &[(i32, i64)], category_transfer_from_sums: &[(i32, i64)], category_transfer_to_sums: &[(i32, i64)], - budget_updates: &[BudgetUpdate], + budget_drips: &[BudgetDrip], ) -> Result<i64> { let transaction_sum = find_by_id_or(transaction_sums, category.id, 0); let category_transfer_from_sum = find_by_id_or(category_transfer_from_sums, category.id, 0); let category_transfer_to_sum = find_by_id_or(category_transfer_to_sums, category.id, 0); - let budget_accruals_sum = calculate_budgets_accrual(category, budget_updates)?; + let budget_accruals_sum = calculate_budgets_accrual(category, budget_drips)?; Ok( transaction_sum @@ -25,17 +25,13 @@ pub fn calculate_category_balance( #[cfg(test)] mod test { - use chrono::{Days, Utc}; - use schist_models::{budget_update::BudgetUpdate, category::Category, date_utc::DateUtc}; + use schist_fakes::{budget_drip::make_fake_budget_drip_builder, category::make_fake_category}; use super::calculate_category_balance; #[test] fn when_no_data_then_returns_zero() { - let category = Category { - id: 0, - name: String::new(), - }; + let category = make_fake_category(0); let result = calculate_category_balance(&category, &[], &[], &[], &[]); @@ -45,27 +41,20 @@ mod test { #[test] fn when_data_only_for_another_category_then_returns_zero() { - let category = Category { - id: 0, - name: String::new(), - }; + let category = make_fake_category(0); let transaction_sums = [(1, 100)]; let category_transfer_from_sums = [(1, 91)]; let category_transfer_to_sums = [(2, 79)]; - let budget_updates = [BudgetUpdate { - id: 0, - category_id: 1, - date: DateUtc::from(Utc::now().checked_sub_days(Days::new(120)).unwrap()), - new_budget: 77, - new_period: 1, - }]; + let budget_drips = [ + make_fake_budget_drip_builder(0).quantity(100).category_id(1).build().unwrap(), + ]; let result = calculate_category_balance( &category, &transaction_sums, &category_transfer_from_sums, &category_transfer_to_sums, - &budget_updates, + &budget_drips, ); assert!(result.is_ok()); @@ -74,21 +63,18 @@ mod test { #[test] fn when_transaction_sum_is_zero_then_returns_zero() { - let category = Category { - id: 0, - name: String::new(), - }; + let category = make_fake_category(0); let transaction_sums = [(0, 0)]; let category_transfer_from_sums = []; let category_transfer_to_sums = []; - let budget_updates = []; + let budget_drips = []; let result = calculate_category_balance( &category, &transaction_sums, &category_transfer_from_sums, &category_transfer_to_sums, - &budget_updates, + &budget_drips, ); assert!(result.is_ok()); @@ -97,21 +83,18 @@ mod test { #[test] fn when_category_transfers_are_zero_then_returns_zero() { - let category = Category { - id: 0, - name: String::new(), - }; + let category = make_fake_category(0); let transaction_sums = []; let category_transfer_from_sums = [(0, 0)]; let category_transfer_to_sums = [(0, 0)]; - let budget_updates = []; + let budget_drips = []; let result = calculate_category_balance( &category, &transaction_sums, &category_transfer_from_sums, &category_transfer_to_sums, - &budget_updates, + &budget_drips, ); assert!(result.is_ok()); @@ -120,30 +103,27 @@ mod test { #[test] fn when_some_data_then_calculates_as_expected() { - let category = Category { - id: 0, - name: String::new(), - }; + let category = make_fake_category(0); let transaction_sums = [(0, 100)]; let category_transfer_from_sums = [(0, 91)]; let category_transfer_to_sums = [(0, 79)]; - let budget_updates = [BudgetUpdate { - id: 0, - category_id: 0, - date: DateUtc::from(&Utc::now().checked_sub_days(Days::new(120)).unwrap()), - new_budget: 77, - new_period: 1, - }]; + let budget_drips = [ + make_fake_budget_drip_builder(0).quantity(77).category_id(0).build().unwrap(), + make_fake_budget_drip_builder(0).quantity(77).category_id(0).build().unwrap(), + make_fake_budget_drip_builder(0).quantity(77).category_id(0).build().unwrap(), + make_fake_budget_drip_builder(0).quantity(77).category_id(0).build().unwrap(), + make_fake_budget_drip_builder(0).quantity(77).category_id(0).build().unwrap(), + ]; let result = calculate_category_balance( &category, &transaction_sums, &category_transfer_from_sums, &category_transfer_to_sums, - &budget_updates, + &budget_drips, ); - let expected_result = 100 + (-91) + 79 + 77 * 120; + let expected_result = 100 + (-91) + 79 + 77 * 5; assert!(result.is_ok()); assert_eq!(result.unwrap(), expected_result); } diff --git a/rust/schist_queries/src/utils/mod.rs b/rust/schist_queries/src/utils/mod.rs index 6949ce5..f2653d8 100644 --- a/rust/schist_queries/src/utils/mod.rs +++ b/rust/schist_queries/src/utils/mod.rs @@ -2,4 +2,7 @@ mod calculate_budgets_accrual; mod calculate_category_balance; mod find_by_id_or; +use calculate_budgets_accrual::calculate_budgets_accrual; + pub use calculate_category_balance::calculate_category_balance; +pub use find_by_id_or::find_by_id_or; |
