diff options
6 files changed, 14 insertions, 14 deletions
diff --git a/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs b/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs index 20d05a0..27f6036 100644 --- a/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs +++ b/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs @@ -42,7 +42,7 @@ mod test { } #[test] - fn when_one_budget_drip_then_return_quantity() { + fn when_one_budget_drip_then_return_amount() { let bucket = make_fake_bucket(0); let budget_drips = [make_fake_drip_builder(0) .amount(100) diff --git a/schist_core/schist_queries/tests/bucket_transactions.rs b/schist_core/schist_queries/tests/bucket_transactions.rs index 9c877af..0b63458 100644 --- a/schist_core/schist_queries/tests/bucket_transactions.rs +++ b/schist_core/schist_queries/tests/bucket_transactions.rs @@ -122,7 +122,7 @@ fn given_deleted_bucket_transactions_when_get_all_bucket_transactions_then_retur } #[test] -fn given_bucket_transactions_when_sum_quantity_per_bucket_id_then_returns_sum_per_bucket_id() { +fn given_bucket_transactions_when_sum_amount_per_bucket_id_then_returns_sum_per_bucket_id() { let context = TestContext::new(); let connection = &mut SqliteConnection::establish(&context.db_url).unwrap(); let buckets = [make_fake_bucket(0), make_fake_bucket(1)]; diff --git a/schist_core/schist_queries/tests/pipes.rs b/schist_core/schist_queries/tests/pipes.rs index 9203aa3..f883fe6 100644 --- a/schist_core/schist_queries/tests/pipes.rs +++ b/schist_core/schist_queries/tests/pipes.rs @@ -115,7 +115,7 @@ fn given_deleted_pipes_when_get_all_pipes_then_return_empty() { } #[test] -fn given_pipes_when_sum_quantity_per_bucket_id_then_returns_sum_quantity_per_bucket_id() { +fn given_pipes_when_sum_amount_per_bucket_id_then_returns_sum_amount_per_bucket_id() { let context = TestContext::new(); let connection = &mut SqliteConnection::establish(&context.db_url).unwrap(); given_accounts(connection); diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs index 6001153..aba37c2 100644 --- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs +++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_budgets_not_carried_over.rs @@ -73,7 +73,7 @@ pub fn transform_bucket_transactions_from_budgets_not_carried_over( id: transform_id(&budget.id), description: format!("Actualbudget budget <{}> not carried over", budget.id), date: start_of_next_month, - quantity: -balance_at_end_of_month, + amount: -balance_at_end_of_month, bucket_id: transform_id(&budget.category_id), }); } @@ -193,7 +193,7 @@ mod test { let result = result.unwrap(); assert_eq!(result.len(), 1); let transaction = result.first().unwrap(); - assert_eq!(transaction.quantity, 1); + assert_eq!(transaction.amount, 1); assert_eq!(transaction.bucket_id, transform_id("c0")); assert_eq!(transaction.date, DateUtc::from_ymd(2026, 2, 1).unwrap()); } @@ -291,14 +291,14 @@ mod test { let result = result.unwrap(); assert_eq!(result.len(), 2); - let transaction = result.iter().find(|bt| bt.quantity == 2); + let transaction = result.iter().find(|bt| bt.amount == 2); assert!(transaction.is_some()); let transaction = transaction.unwrap(); - assert_eq!(transaction.quantity, 2); + assert_eq!(transaction.amount, 2); assert_eq!(transaction.bucket_id, transform_id("c0")); assert_eq!(transaction.date, DateUtc::from_ymd(2024, 3, 1).unwrap()); - let transaction = result.iter().find(|bt| bt.quantity == 3); + let transaction = result.iter().find(|bt| bt.amount == 3); assert!(transaction.is_some()); let transaction = transaction.unwrap(); assert_eq!(transaction.bucket_id, transform_id("c0")); diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs index c5a8cf6..88ab416 100644 --- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs +++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_bucket_transactions_from_category_transfers.rs @@ -106,7 +106,7 @@ fn transform_category_transfer_without_context( bail!("actualbudget category transfer amounts did not sum to zero"); } - let quantity: i32 = deposit.amount.try_into().unwrap(); + let amount: i32 = deposit.amount.try_into().unwrap(); let date = transform_date(&actualbudget_parent_category_transfer.date)?; Ok(vec![ @@ -116,7 +116,7 @@ fn transform_category_transfer_without_context( .notes .clone() .unwrap_or_else(String::new), - amount: -quantity, + amount: -amount, bucket_id: withdrawal_bucket_id, }, BucketTransaction { @@ -125,7 +125,7 @@ fn transform_category_transfer_without_context( .notes .clone() .unwrap_or_else(String::new), - amount: quantity, + amount, date, bucket_id: deposit_id, }, diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/drip_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/drip_matchers.rs index 629a04b..ccb1715 100644 --- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/drip_matchers.rs +++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/drip_matchers.rs @@ -33,7 +33,7 @@ pub fn assert_drip_matches(drip: &Drip, buckets: &[Bucket]) { .as_str(), ); - let expected_quantity = match (bucket_name.as_str(), drip.date.month(), drip.date.day()) { + let expected_amount = match (bucket_name.as_str(), drip.date.month(), drip.date.day()) { (BUCKET_NAME_FOOD, 8 | 10, 1) => 6_50, (BUCKET_NAME_FOOD, 8 | 10, _) => 6_45, (BUCKET_NAME_FOOD, 9 | 11, 1) => 6_86, @@ -70,8 +70,8 @@ pub fn assert_drip_matches(drip: &Drip, buckets: &[Bucket]) { }; assert_eq!( - expected_quantity, drip.amount, - "drip {:?} had unexpected quantity", + expected_amount, drip.amount, + "drip {:?} had unexpected amount", drip, ); } |