Swaps budget updates for budget drips

3 files changed, 188 insertions, 514 deletions

diff --git a/rust/schist_queries/tests/budget_drips.rs b/rust/schist_queries/tests/budget_drips.rs
new file mode 100644
index 0000000..ac33885
--- /dev/null
+++ b/rust/schist_queries/tests/budget_drips.rs
@@ -0,0 +1,186 @@
+mod common;
+
+use common::test_context::TestContext;
+use diesel::{Connection, SqliteConnection};
+use schist_fakes::{budget_drip::make_fake_budget_drip_builder, category::make_fake_category};
+use schist_models::{category::Category, date_utc::DateUtc};
+use schist_queries as queries;
+
+fn given_categories(connection: &mut SqliteConnection) -> Vec<Category> {
+    let categories = vec![make_fake_category(0), make_fake_category(1)];
+    let _ = queries::categories::insert_categories(&categories, connection);
+    categories
+}
+
+#[test]
+fn when_insert_budget_drips_then_returns_num_budget_drips() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+    let budget_drips = [
+        make_fake_budget_drip_builder(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+        make_fake_budget_drip_builder(1)
+            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+    ];
+
+    let num_budget_drips_inserted = queries::budget_drips::insert_budget_drips(&budget_drips, connection).unwrap();
+
+    assert_eq!(num_budget_drips_inserted, 2);
+}
+
+#[test]
+fn given_budget_drip_when_insert_budget_drip_same_category_and_same_date_then_return_err() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+
+    let budget_drips_1 = [
+        make_fake_budget_drip_builder(0)
+            .category_id(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .build().unwrap()
+    ];
+    let _ = queries::budget_drips::insert_budget_drips(&budget_drips_1, connection);
+
+    let budget_drips_2 = [
+        make_fake_budget_drip_builder(1)
+            .category_id(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .build().unwrap()
+    ];
+    let result = queries::budget_drips::insert_budget_drips(&budget_drips_2, connection);
+
+    assert!(result.is_err());
+}
+
+#[test]
+fn given_budget_drip_when_insert_budget_drip_different_category_and_same_date_then_return_num_budget_drips_inserted() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+
+    let budget_drips_1 = [
+        make_fake_budget_drip_builder(0)
+            .category_id(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .build().unwrap()
+    ];
+    let _ = queries::budget_drips::insert_budget_drips(&budget_drips_1, connection);
+
+    let budget_drips_2 = [
+        make_fake_budget_drip_builder(1)
+            .category_id(1)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .build().unwrap()
+    ];
+    let result = queries::budget_drips::insert_budget_drips(&budget_drips_2, connection);
+
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), 1);
+}
+
+#[test]
+fn given_budget_drip_when_insert_budget_drip_same_category_and_different_date_then_return_num_budget_drips_inserted() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+
+    let budget_drips_1 = [
+        make_fake_budget_drip_builder(0)
+            .category_id(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .build().unwrap()
+    ];
+    let _ = queries::budget_drips::insert_budget_drips(&budget_drips_1, connection);
+
+    let budget_drips_2 = [
+        make_fake_budget_drip_builder(1)
+            .category_id(0)
+            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
+            .build().unwrap()
+    ];
+    let result = queries::budget_drips::insert_budget_drips(&budget_drips_2, connection);
+
+    assert!(result.is_ok());
+    assert_eq!(result.unwrap(), 1);
+}
+
+#[test]
+fn given_budget_drips_when_get_all_budget_drips_then_return_budget_drips() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+    let budget_drips = [
+        make_fake_budget_drip_builder(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+        make_fake_budget_drip_builder(1)
+            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+    ];
+    let _ = queries::budget_drips::insert_budget_drips(&budget_drips, connection).unwrap();
+
+    let budget_drips_in_db = queries::budget_drips::get_all_budget_drips(connection).unwrap();
+
+    assert_eq!(budget_drips_in_db.len(), budget_drips.len());
+    assert_eq!(budget_drips_in_db[0], budget_drips[0]);
+    assert_eq!(budget_drips_in_db[1], budget_drips[1]);
+    for budget_drip in &budget_drips {
+        assert!(budget_drips_in_db.iter().any(|budget_drip_in_db| budget_drip_in_db.eq(&budget_drip)));
+    }
+    for budget_drip_in_db in budget_drips_in_db {
+        assert!(budget_drips.iter().any(|budget_drip| budget_drip.eq(&budget_drip_in_db)));
+    }
+}
+
+#[test]
+fn given_budget_drips_when_delete_all_budget_drips_then_return_num_of_budget_drips() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+    let budget_drips = [
+        make_fake_budget_drip_builder(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+        make_fake_budget_drip_builder(1)
+            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+    ];
+    let _ = queries::budget_drips::insert_budget_drips(&budget_drips, connection).unwrap();
+
+    let num_budget_drips_deleted = queries::budget_drips::delete_all_budget_drips(connection).unwrap();
+
+    assert_eq!(num_budget_drips_deleted, budget_drips.len());
+}
+
+#[test]
+fn given_deleted_budget_drips_when_get_all_budget_drips_then_return_empty() {
+    let context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
+    let _categories = given_categories(connection);
+    let budget_drips = [
+        make_fake_budget_drip_builder(0)
+            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+        make_fake_budget_drip_builder(1)
+            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
+            .category_id(0)
+            .build().unwrap(),
+    ];
+    let _ = queries::budget_drips::insert_budget_drips(&budget_drips, connection).unwrap();
+    let _ = queries::budget_drips::delete_all_budget_drips(connection).unwrap();
+
+    let budget_drips_returned = queries::budget_drips::get_all_budget_drips(connection).unwrap();
+
+    assert_eq!(budget_drips_returned.len(), 0);
+}
diff --git a/rust/schist_queries/tests/budget_updates.rs b/rust/schist_queries/tests/budget_updates.rs
deleted file mode 100644
index bd84128..0000000
--- a/rust/schist_queries/tests/budget_updates.rs
+++ /dev/null
@@ -1,358 +0,0 @@
-mod common;
-
-use common::test_context::TestContext;
-use diesel::{Connection, SqliteConnection};
-use schist_fakes::{budget_update::make_fake_budget_update_builder, category::make_fake_category};
-use schist_models::{category::Category, date_utc::DateUtc};
-use schist_queries as queries;
-use schist_traits::nowlike::Nowlike;
-
-fn given_categories(connection: &mut SqliteConnection) -> Vec<Category> {
-    let categories = vec![make_fake_category(0), make_fake_category(1)];
-    let _ = queries::categories::insert_categories(&categories, connection);
-    categories
-}
-
-#[test]
-fn when_insert_budget_updates_then_returns_num_budget_updates() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-        make_fake_budget_update_builder(1)
-            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-    ];
-
-    let num_budget_updates_inserted = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-
-    assert_eq!(num_budget_updates_inserted, 2);
-}
-
-#[test]
-fn given_budget_update_when_insert_budget_update_same_category_and_same_date_then_return_err() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-
-    let budget_updates_1 = [
-        make_fake_budget_update_builder(0)
-            .category_id(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .build().unwrap()
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates_1, connection);
-
-    let budget_updates_2 = [
-        make_fake_budget_update_builder(1)
-            .category_id(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .build().unwrap()
-    ];
-    let result = queries::budget_updates::insert_budget_updates(&budget_updates_2, connection);
-
-    assert!(result.is_err());
-}
-
-#[test]
-fn given_budget_update_when_insert_budget_update_different_category_and_same_date_then_return_num_budget_updates_inserted() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-
-    let budget_updates_1 = [
-        make_fake_budget_update_builder(0)
-            .category_id(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .build().unwrap()
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates_1, connection);
-
-    let budget_updates_2 = [
-        make_fake_budget_update_builder(1)
-            .category_id(1)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .build().unwrap()
-    ];
-    let result = queries::budget_updates::insert_budget_updates(&budget_updates_2, connection);
-
-    assert!(result.is_ok());
-    assert_eq!(result.unwrap(), 1);
-}
-
-#[test]
-fn given_budget_update_when_insert_budget_update_same_category_and_different_date_then_return_num_budget_updates_inserted() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-
-    let budget_updates_1 = [
-        make_fake_budget_update_builder(0)
-            .category_id(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .build().unwrap()
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates_1, connection);
-
-    let budget_updates_2 = [
-        make_fake_budget_update_builder(1)
-            .category_id(0)
-            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
-            .build().unwrap()
-    ];
-    let result = queries::budget_updates::insert_budget_updates(&budget_updates_2, connection);
-
-    assert!(result.is_ok());
-    assert_eq!(result.unwrap(), 1);
-}
-
-#[test]
-fn given_budget_updates_when_get_all_budget_updates_then_return_budget_updates() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-        make_fake_budget_update_builder(1)
-            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-
-    let budget_updates_in_db = queries::budget_updates::get_all_budget_updates(connection).unwrap();
-
-    assert_eq!(budget_updates_in_db.len(), budget_updates.len());
-    assert_eq!(budget_updates_in_db[0], budget_updates[0]);
-    assert_eq!(budget_updates_in_db[1], budget_updates[1]);
-    for budget_update in &budget_updates {
-        assert!(budget_updates_in_db.iter().any(|budget_update_in_db| budget_update_in_db.eq(&budget_update)));
-    }
-    for budget_update_in_db in budget_updates_in_db {
-        assert!(budget_updates.iter().any(|budget_update| budget_update.eq(&budget_update_in_db)));
-    }
-}
-
-#[test]
-fn given_budget_updates_when_delete_all_budget_updates_then_return_num_of_budget_updates() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-        make_fake_budget_update_builder(1)
-            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-
-    let num_budget_updates_deleted = queries::budget_updates::delete_all_budget_updates(connection).unwrap();
-
-    assert_eq!(num_budget_updates_deleted, budget_updates.len());
-}
-
-#[test]
-fn given_deleted_budget_updates_when_get_all_budget_updates_then_return_empty() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0)
-            .date(DateUtc::from_ymd(2020, 12, 25).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-        make_fake_budget_update_builder(1)
-            .date(DateUtc::from_ymd(2020, 12, 26).unwrap())
-            .category_id(0)
-            .build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-    let _ = queries::budget_updates::delete_all_budget_updates(connection).unwrap();
-
-    let budget_updates_returned = queries::budget_updates::get_all_budget_updates(connection).unwrap();
-
-    assert_eq!(budget_updates_returned.len(), 0);
-}
-
-#[test]
-fn given_no_categories_when_get_first_with_date_and_category_id_then_return_none() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-
-    let first_with_date_and_category_id =
-        queries::budget_updates::get_first_budget_update_with_date_and_category_id(
-            &DateUtc::now(),
-            0,
-            connection,
-        ).unwrap();
-
-    assert!(first_with_date_and_category_id.is_none());
-}
-
-#[test]
-fn given_no_budget_updates_when_get_first_with_date_and_category_id_then_return_none() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-
-    let first_with_date_and_category_id =
-        queries::budget_updates::get_first_budget_update_with_date_and_category_id(
-            &DateUtc::now(),
-            0,
-            connection,
-        ).unwrap();
-
-    assert!(first_with_date_and_category_id.is_none());
-}
-
-#[test]
-fn given_budget_update_when_get_first_with_date_then_return_budget_update() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let date: DateUtc = "2024-10-28".parse().unwrap();
-    let budget_update = make_fake_budget_update_builder(0).date(date.clone()).build().unwrap();
-    let _ = queries::budget_updates::insert_budget_updates(&[budget_update.clone()], connection).unwrap();
-
-    let first_with_date_and_category_id =
-        queries::budget_updates::get_first_budget_update_with_date_and_category_id(
-            &date,
-            0,
-            connection,
-        ).unwrap();
-
-    assert!(first_with_date_and_category_id.is_some());
-    assert_eq!(first_with_date_and_category_id.unwrap(), budget_update);
-}
-
-#[test]
-fn given_budget_update_when_get_first_with_date_and_different_category_id_then_return_none() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let date: DateUtc = "2024-10-28".parse().unwrap();
-    let different_date: DateUtc = "2024-10-29".parse().unwrap();
-    let budget_update = make_fake_budget_update_builder(0).date(date.clone()).build().unwrap();
-    let _ = queries::budget_updates::insert_budget_updates(&[budget_update.clone()], connection).unwrap();
-
-    let first_with_date_and_category_id =
-        queries::budget_updates::get_first_budget_update_with_date_and_category_id(
-            &different_date,
-            2,
-            connection
-        ).unwrap();
-
-    assert!(first_with_date_and_category_id.is_none());
-}
-
-#[test]
-fn given_budget_update_when_get_first_with_different_date_and_category_id_then_return_none() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let date: DateUtc = "2024-10-28".parse().unwrap();
-    let different_date: DateUtc = "2024-10-29".parse().unwrap();
-    let budget_update = make_fake_budget_update_builder(0).date(date.clone()).build().unwrap();
-    let _ = queries::budget_updates::insert_budget_updates(&[budget_update.clone()], connection).unwrap();
-
-    let first_with_date_and_category_id =
-        queries::budget_updates::get_first_budget_update_with_date_and_category_id(
-            &different_date,
-            0,
-            connection
-        ).unwrap();
-
-    assert!(first_with_date_and_category_id.is_none());
-}
-
-#[test]
-fn given_many_budget_updates_when_get_first_with_date_and_category_id_then_return_any_with_date() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0).date("2024-12-25".parse().unwrap()).category_id(0).build().unwrap(),
-        make_fake_budget_update_builder(1).date("2024-12-25".parse().unwrap()).category_id(1).build().unwrap(),
-        make_fake_budget_update_builder(2).date("2020-12-26".parse().unwrap()).category_id(0).build().unwrap(),
-        make_fake_budget_update_builder(3).date("2020-12-26".parse().unwrap()).category_id(1).build().unwrap(),
-        make_fake_budget_update_builder(4).date("2020-12-27".parse().unwrap()).category_id(0).build().unwrap(),
-        make_fake_budget_update_builder(5).date("2020-12-27".parse().unwrap()).category_id(1).build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-
-    let first_with_date_and_category_id =
-        queries::budget_updates::get_first_budget_update_with_date_and_category_id(
-            &"2024-12-25".parse().unwrap(),
-            0,
-            connection,
-        ).unwrap();
-
-    assert!(first_with_date_and_category_id.is_some());
-    assert_eq!(first_with_date_and_category_id.unwrap(), budget_updates[0]);
-}
-
-#[test]
-fn given_many_budget_updates_when_get_most_recent_with_category_id_then_return_correct_date() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0)
-            .category_id(0)
-            .date("2024-12-25".parse().unwrap())
-            .build().unwrap(),
-        make_fake_budget_update_builder(1)
-            .category_id(0)
-            .date("2020-12-26".parse().unwrap())
-            .build().unwrap(),
-        make_fake_budget_update_builder(2)
-            .category_id(1)
-            .date("2020-12-27".parse().unwrap())
-            .build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-
-    let most_recent_with_category = queries::budget_updates::get_most_recent_budget_update_date_with_category_id(
-        0, connection,
-    );
-
-    assert!(most_recent_with_category.is_ok());
-    let most_recent_with_category = most_recent_with_category.unwrap();
-    assert!(most_recent_with_category .is_some());
-    let most_recent_with_category = most_recent_with_category.unwrap();
-    assert_eq!(most_recent_with_category, budget_updates[1].date);
-}
-
-#[test]
-fn given_budget_update_when_get_most_recent_with_different_category_id_then_return_none() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let _categories = given_categories(connection);
-    let budget_updates = [
-        make_fake_budget_update_builder(0)
-            .category_id(1)
-            .date("2020-12-27".parse().unwrap())
-            .build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection).unwrap();
-
-    let most_recent_with_category = queries::budget_updates::get_most_recent_budget_update_date_with_category_id(
-        0, connection,
-    );
-
-    assert!(most_recent_with_category.is_ok());
-    let most_recent_with_category = most_recent_with_category.unwrap();
-    assert!(most_recent_with_category .is_none());
-}
diff --git a/rust/schist_queries/tests/categories.rs b/rust/schist_queries/tests/categories.rs
index 74c395d..915e853 100644
--- a/rust/schist_queries/tests/categories.rs
+++ b/rust/schist_queries/tests/categories.rs
@@ -1,24 +1,9 @@
 mod common;
 
-use chrono::{Days, Utc};
 use common::test_context::TestContext;
 use diesel::{Connection, SqliteConnection};
-use schist_fakes::{
-    account::make_fake_account,
-    budget_update::make_fake_budget_update_builder,
-    category::make_fake_category,
-    transaction::make_fake_transaction_builder,
-    transaction_categorisation::make_fake_transaction_categorisation_builder,
-};
-use schist_models::{
-    account::Account,
-    budget::Budget,
-    budget_update::BudgetUpdate,
-    category::Category,
-    date_utc::DateUtc,
-    transaction::Transaction,
-    transaction_categorisation::TransactionCategorisation,
-};
+use schist_fakes::category::make_fake_category;
+use schist_models::category::Category;
 use schist_queries as queries;
 
 fn given_categories(connection: &mut SqliteConnection) -> Vec<Category> {
@@ -27,52 +12,6 @@ fn given_categories(connection: &mut SqliteConnection) -> Vec<Category> {
     categories
 }
 
-fn given_transactions(connection: &mut SqliteConnection) -> Vec<Transaction> {
-    let transactions = vec![
-        make_fake_transaction_builder(0).quantity(1).build().unwrap(),
-        make_fake_transaction_builder(1).quantity(2).build().unwrap(),
-        make_fake_transaction_builder(2).quantity(4).build().unwrap(),
-        make_fake_transaction_builder(3).quantity(8).build().unwrap(),
-    ];
-    let _ = queries::transactions::insert_transactions(&transactions, connection).unwrap();
-    transactions
-}
-
-fn given_accounts(connection: &mut SqliteConnection) -> Vec<Account> {
-    let accounts = vec![
-        make_fake_account(0),
-    ];
-    let _ = queries::accounts::insert_accounts(&accounts, connection);
-    accounts
-}
-
-fn given_transaction_categorisations(connection: &mut SqliteConnection) -> Vec<TransactionCategorisation> {
-    let transaction_categorisations = vec![
-        make_fake_transaction_categorisation_builder(0).quantity(1).transaction_id(0).category_id(0).build().unwrap(),
-        make_fake_transaction_categorisation_builder(1).quantity(1).transaction_id(1).category_id(0).build().unwrap(),
-        make_fake_transaction_categorisation_builder(2).quantity(1).transaction_id(1).category_id(0).build().unwrap(),
-        make_fake_transaction_categorisation_builder(3).quantity(4).transaction_id(2).category_id(1).build().unwrap(),
-        make_fake_transaction_categorisation_builder(4).quantity(3).transaction_id(3).category_id(1).build().unwrap(),
-        make_fake_transaction_categorisation_builder(5).quantity(5).transaction_id(3).category_id(1).build().unwrap(),
-    ];
-    let _ = queries::transaction_categorisations::insert_transaction_categorisations(&transaction_categorisations, connection).unwrap();
-    transaction_categorisations
-}
-
-fn given_budget_updates(connection: &mut SqliteConnection) -> Vec<BudgetUpdate> {
-    let now = Utc::now();
-    let twenty_days_ago = DateUtc::from(now.checked_sub_days(Days::new(20)).unwrap());
-    let ten_days_ago = DateUtc::from(now.checked_sub_days(Days::new(10)).unwrap());
-    let budget_updates = vec![
-        make_fake_budget_update_builder(0).category_id(0).date(twenty_days_ago.clone()).new_budget(100).new_period(1).build().unwrap(),
-        make_fake_budget_update_builder(1).category_id(0).date(ten_days_ago.clone()).new_budget(50).new_period(2).build().unwrap(),
-        make_fake_budget_update_builder(2).category_id(1).date(twenty_days_ago.clone()).new_budget(90).new_period(4).build().unwrap(),
-        make_fake_budget_update_builder(3).category_id(1).date(ten_days_ago.clone()).new_budget(40).new_period(8).build().unwrap(),
-    ];
-    let _ = queries::budget_updates::insert_budget_updates(&budget_updates, connection);
-    budget_updates
-}
-
 #[test]
 fn when_insert_categories_then_returns_num_categories() {
     let context = TestContext::new();
@@ -125,49 +64,6 @@ fn given_deleted_categories_when_get_all_categories_then_return_empty() {
 }
 
 #[test]
-fn given_categories_and_no_transactions_when_get_all_balances_then_return_all_zero() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    given_categories(connection);
-
-    let balances = queries::categories::get_all_category_balances(connection);
-
-    assert!(balances.is_ok());
-    let mut balances = balances.unwrap();
-    balances.sort_by(|b1, b2| b1.category_id.cmp(&b2.category_id));
-    assert_eq!(balances.len(), 2);
-    for balance in balances {
-        assert_eq!(0, balance.balance);
-    }
-}
-
-#[test]
-fn given_categories_and_transaction_categorisations_when_get_all_balances_then_return_balances() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let categories = given_categories(connection);
-    let _accounts = given_accounts(connection);
-    let _transactions = given_transactions(connection);
-    let transaction_categorisations = given_transaction_categorisations(connection);
-
-    let balances = queries::categories::get_all_category_balances(connection);
-
-    assert!(balances.is_ok());
-    let mut balances = balances.unwrap();
-    balances.sort_by(|b1, b2| b1.category_id.cmp(&b2.category_id));
-    assert_eq!(balances.len(), categories.len());
-    for category in categories {
-        let balance = balances.iter().find(|b| b.category_id == category.id).unwrap();
-        let expected_balance: i32 = transaction_categorisations
-            .iter()
-            .filter(|t| t.category_id == category.id)
-            .map(|t| t.quantity)
-            .sum();
-        assert_eq!(expected_balance, balance.balance);
-    }
-}
-
-#[test]
 fn given_categories_when_get_all_ids_then_return_all_ids() {
     let context = TestContext::new();
     let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
@@ -183,53 +79,3 @@ fn given_categories_when_get_all_ids_then_return_all_ids() {
         assert!(categories.iter().any(|category| category.id == id));
     }
 }
-
-#[test]
-fn given_categories_and_no_budget_updates_when_get_most_recent_budget_per_category_id_then_return_none() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let categories = given_categories(connection);
-
-    let most_recent_budget_per_category_id = queries::categories::get_most_recent_category_budget_per_category_id(connection);
-
-    assert!(most_recent_budget_per_category_id.is_ok());
-    let most_recent_budget_per_category_id = most_recent_budget_per_category_id.unwrap();
-    assert_eq!(categories.len(), most_recent_budget_per_category_id.len());
-    for category in categories {
-        let most_recent_budget = most_recent_budget_per_category_id.iter().find(|b| b.category_id == category.id);
-        assert!(most_recent_budget.is_some());
-        let most_recent_budget = most_recent_budget.unwrap();
-        assert!(most_recent_budget.budget.is_none());
-    }
-}
-
-#[test]
-fn given_categories_and_budget_updates_when_get_most_recent_budget_per_category_id_then_return_most_recent_budget() {
-    let context = TestContext::new();
-    let connection = &mut SqliteConnection::establish(&context.db_url).unwrap();
-    let categories = given_categories(connection);
-    let budget_updates = given_budget_updates(connection);
-
-    let most_recent_budget_per_category_id = queries::categories::get_most_recent_category_budget_per_category_id(connection);
-
-    assert!(most_recent_budget_per_category_id.is_ok());
-    let most_recent_budget_per_category_id = most_recent_budget_per_category_id.unwrap();
-    assert_eq!(categories.len(), most_recent_budget_per_category_id.len());
-    for category in categories {
-        let most_recent_budget_update = budget_updates
-            .iter()
-            .filter(|bu| bu.category_id == category.id)
-            .max_by_key(|bu| bu.date.clone())
-            .unwrap();
-
-        let most_recent_budget = most_recent_budget_per_category_id.iter().find(|b| b.category_id == category.id);
-        assert!(most_recent_budget.is_some());
-        let most_recent_budget = most_recent_budget.unwrap();
-        assert!(most_recent_budget.budget.is_some());
-        let most_recent_budget = most_recent_budget.budget.unwrap();
-        assert_eq!(most_recent_budget, Budget {
-            quantity: most_recent_budget_update.new_budget,
-            period: most_recent_budget_update.new_period,
-        });
-    }
-}