Swaps budget updates for budget drips

40 files changed, 607 insertions, 1094 deletions

diff --git a/rust/schist_actualbudget_importer/src/schist_state.rs b/rust/schist_actualbudget_importer/src/schist_state.rs
index a42e446..92c97b3 100644
--- a/rust/schist_actualbudget_importer/src/schist_state.rs
+++ b/rust/schist_actualbudget_importer/src/schist_state.rs
@@ -1,12 +1,20 @@
 use anyhow::Result;
 use diesel::SqliteConnection;
-use schist_models::{account::Account, budget_update::BudgetUpdate, category::Category, category_transfer::CategoryTransfer, datetime_utc::DatetimeUtc, transaction::Transaction, transaction_categorisation::TransactionCategorisation};
+use schist_models::{
+    account::Account,
+    budget_drip::BudgetDrip,
+    category::Category,
+    category_transfer::CategoryTransfer,
+    datetime_utc::DatetimeUtc,
+    transaction::Transaction,
+    transaction_categorisation::TransactionCategorisation,
+};
 
 pub struct SchistState {
     pub first_transaction_date: DatetimeUtc,
     pub accounts: Vec<Account>,
     pub categories: Vec<Category>,
-    pub budget_updates: Vec<BudgetUpdate>,
+    pub budget_drips: Vec<BudgetDrip>,
     pub transactions: Vec<Transaction>,
     pub transaction_categorisations: Vec<TransactionCategorisation>,
     pub category_transfers: Vec<CategoryTransfer>,
@@ -16,7 +24,7 @@ pub fn export_schist_state(schist_state: &SchistState, schist_connection: &mut S
     schist_queries::clear::clear(schist_connection)?;
     schist_queries::accounts::insert_accounts(&schist_state.accounts, schist_connection)?;
     schist_queries::categories::insert_categories(&schist_state.categories, schist_connection)?;
-    schist_queries::budget_updates::insert_budget_updates(&schist_state.budget_updates, schist_connection)?;
+    schist_queries::budget_drips::insert_budget_drips(&schist_state.budget_drips, schist_connection)?;
     schist_queries::transactions::insert_transactions(&schist_state.transactions, schist_connection)?;
     schist_queries::transaction_categorisations::insert_transaction_categorisations(&schist_state.transaction_categorisations, schist_connection)?;
     schist_queries::category_transfers::insert_category_transfers(&schist_state.category_transfers, schist_connection)?;
diff --git a/rust/schist_actualbudget_importer/src/transform_state/mod.rs b/rust/schist_actualbudget_importer/src/transform_state/mod.rs
index d82a59e..916894a 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/mod.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/mod.rs
@@ -1,6 +1,6 @@
 mod is_category_transfer;
 mod transform_accounts;
-mod transform_budget_updates;
+mod transform_budget_drips;
 mod transform_categories;
 mod transform_category_transfers;
 mod transform_date;
@@ -11,7 +11,6 @@ mod transform_transactions;
 use is_category_transfer::is_category_transfer;
 use is_category_transfer::is_not_category_transfer;
 use transform_accounts::transform_accounts;
-use transform_budget_updates::transform_budget_updates;
 use transform_categories::transform_categories;
 use transform_category_transfers::transform_category_transfers;
 use transform_date::transform_date;
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_budget_drips.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_budget_drips.rs
new file mode 100644
index 0000000..418c759
--- /dev/null
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_budget_drips.rs
@@ -0,0 +1,6 @@
+use anyhow::Result;
+use schist_models::budget_drip::BudgetDrip;
+
+pub fn transform_budget_drips() -> Result<Vec<BudgetDrip>> {
+    todo!();
+}
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs
deleted file mode 100644
index f4d0e3f..0000000
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use anyhow::Result;
-use actualbudget_models::ActualbudgetZeroBudget;
-use schist_models::{budget_update::BudgetUpdate, date_utc::DateUtc};
-
-use super::{transform_date, transform_id};
-
-pub fn transform_budget_updates(
-    actualbudget_zero_budgets: &[ActualbudgetZeroBudget],
-) -> Result<Vec<BudgetUpdate>> {
-    let mut budget_updates = Vec::<BudgetUpdate>::new();
-    for zero_budget in actualbudget_zero_budgets {
-        let first_zero_budget_in_category = get_first_zero_budget_in_category(
-            actualbudget_zero_budgets,
-            &zero_budget.category_id.clone(),
-        );
-        if first_zero_budget_in_category.is_some_and(|zb| zb.id == zero_budget.id) {
-            continue;
-        }
-        budget_updates.push(BudgetUpdate {
-            id: transform_id(&zero_budget.id.clone()),
-            category_id: transform_id(&zero_budget.category_id.clone()),
-            date: DateUtc::from(transform_date(&zero_budget.month.clone())?),
-            new_budget: zero_budget.amount.try_into().unwrap(),
-            new_period: 30,
-        })
-    }
-    Ok(budget_updates)
-}
-
-fn get_first_zero_budget_in_category(
-    actualbudget_zero_budgets: &[ActualbudgetZeroBudget],
-    actualbudget_category_id: &str,
-) -> Option<ActualbudgetZeroBudget> {
-    let mut category_zero_budgets = actualbudget_zero_budgets.to_vec();
-    category_zero_budgets.retain(|zb| zb.category_id == actualbudget_category_id);
-    category_zero_budgets
-        .iter()
-        .min_by_key(|zb| zb.month.clone())
-        .cloned()
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn todo() {
-        todo!()
-    }
-}
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs
index 8b4a962..e0fc687 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs
@@ -1,5 +1,5 @@
 use actualbudget_models::ActualbudgetCategory;
-use schist_models::category::Category;
+use schist_models::{budget_period_unit::BudgetPeriodUnit, category::Category};
 
 use super::transform_id;
 
@@ -11,11 +11,24 @@ pub fn transform_categories(
         categories.push(Category {
             id: transform_id(&actualbudget_category.id.clone()),
             name: actualbudget_category.name.clone(),
+            balance: 0,
+            balance_date: get_balance_date(),
+            budget_period: 1,
+            budget_period_unit: BudgetPeriodUnit::Month,
+            budget_quantity: get_budget_quantity(),
         })
     }
     categories
 }
 
+fn get_balance_date() -> schist_models::date_utc::DateUtc {
+    todo!()
+}
+
+fn get_budget_quantity() -> i32 {
+    todo!()
+}
+
 #[cfg(test)]
 mod test {
     #[test]
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_state.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_state.rs
index 9236532..d8918bc 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_state.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_state.rs
@@ -1,19 +1,18 @@
 use anyhow::Result;
-use schist_models::{account::Account, budget_update::BudgetUpdate, category::Category, category_transfer::CategoryTransfer, transaction::Transaction, transaction_categorisation::TransactionCategorisation};
+use schist_models::{account::Account, category::Category, category_transfer::CategoryTransfer, transaction::Transaction, transaction_categorisation::TransactionCategorisation};
 
 use crate::{actualbudget_state::ActualbudgetState, schist_state::SchistState};
 
-use super::{transform_accounts, transform_budget_updates, transform_categories, transform_category_transfers, transform_date, transform_transactions};
+use super::{transform_accounts, transform_budget_drips::transform_budget_drips, transform_categories, transform_category_transfers, transform_date, transform_transactions};
 
 pub fn transform_state(actualbudget_state: ActualbudgetState) -> Result<SchistState> {
     let first_transaction_date =
         transform_date(&actualbudget_state.actualbudget_first_transaction_date)?;
     let accounts: Vec<Account> =
         transform_accounts(&actualbudget_state.actualbudget_accounts, &first_transaction_date);
+    let budget_drips = transform_budget_drips()?;
     let categories: Vec<Category> =
         transform_categories(&actualbudget_state.actualbudget_categories);
-    let budget_updates: Vec<BudgetUpdate> =
-        transform_budget_updates(&actualbudget_state.actualbudget_zero_budgets)?;
     let (transactions, transaction_categorisations): (Vec<Transaction>, Vec<TransactionCategorisation>) =
         transform_transactions(
             &actualbudget_state.actualbudget_transactions,
@@ -28,7 +27,7 @@ pub fn transform_state(actualbudget_state: ActualbudgetState) -> Result<SchistSt
         first_transaction_date,
         accounts,
         categories,
-        budget_updates,
+        budget_drips,
         transactions,
         transaction_categorisations,
         category_transfers,
diff --git a/rust/schist_backend/src/main.rs b/rust/schist_backend/src/main.rs
index aa46cb4..8395681 100644
--- a/rust/schist_backend/src/main.rs
+++ b/rust/schist_backend/src/main.rs
@@ -42,9 +42,6 @@ async fn rocket() -> Rocket<Build> {
             routes![
                 routes::account::get_all_accounts,
                 routes::account::create_account,
-                routes::balance::get_all_category_balances,
-                routes::budget::get_current_category_budget_per_category,
-                routes::budget_update::get_all_budget_updates,
                 routes::category::get_all_categories,
             ],
         )
diff --git a/rust/schist_backend/src/routes/balance.rs b/rust/schist_backend/src/routes/balance.rs
deleted file mode 100644
index d7c01d5..0000000
--- a/rust/schist_backend/src/routes/balance.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use rocket::{get, http::Status, serde::json::Json};
-use schist_models::category_balance::CategoryBalance;
-use schist_queries::categories::get_all_category_balances as get_all_category_balances_query;
-
-use crate::databases::UserDataDb;
-#[get("/balance/category")]
-pub async fn get_all_category_balances(
-    user_data_db: UserDataDb,
-) -> Result<Json<Vec<CategoryBalance>>, Status> {
-    user_data_db
-        .run(get_all_category_balances_query)
-        .await
-        .map(Json)
-        .map_err(|_| Status { code: 500 })
-}
diff --git a/rust/schist_backend/src/routes/budget.rs b/rust/schist_backend/src/routes/budget.rs
deleted file mode 100644
index 89438b9..0000000
--- a/rust/schist_backend/src/routes/budget.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use rocket::get;
-use rocket::http::Status;
-use rocket::serde::json::Json;
-use schist_models::category_budget::CategoryBudget;
-use schist_queries::categories::get_most_recent_category_budget_per_category_id as get_most_recent_category_budget_per_category_id_query;
-
-use crate::databases::UserDataDb;
-
-#[get("/budget/category?current")]
-pub async fn get_current_category_budget_per_category(
-    user_data_db: UserDataDb,
-) -> Result<Json<Vec<CategoryBudget>>, Status> {
-    user_data_db
-        .run(get_most_recent_category_budget_per_category_id_query)
-        .await
-        .map(Json)
-        .map_err(|_| Status { code: 500 })
-}
diff --git a/rust/schist_backend/src/routes/budget_update.rs b/rust/schist_backend/src/routes/budget_update.rs
deleted file mode 100644
index c70a9b7..0000000
--- a/rust/schist_backend/src/routes/budget_update.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use rocket::get;
-use rocket::http::Status;
-use rocket::serde::json::Json;
-use schist_models::budget_update::BudgetUpdate;
-use schist_queries::budget_updates::get_all_budget_updates as get_all_budget_updates_query;
-
-use crate::databases::UserDataDb;
-
-#[get("/budget-update")]
-pub async fn get_all_budget_updates(
-    user_data_db: UserDataDb,
-) -> Result<Json<Vec<BudgetUpdate>>, Status> {
-    user_data_db
-        .run(get_all_budget_updates_query)
-        .await
-        .map(Json)
-        .map_err(|_| Status { code: 500 })
-}
diff --git a/rust/schist_backend/src/routes/mod.rs b/rust/schist_backend/src/routes/mod.rs
index bf0ab4a..e22565c 100644
--- a/rust/schist_backend/src/routes/mod.rs
+++ b/rust/schist_backend/src/routes/mod.rs
@@ -1,5 +1,2 @@
 pub mod account;
-pub mod balance;
-pub mod budget;
-pub mod budget_update;
 pub mod category;
diff --git a/rust/schist_fakes/src/budget_drip.rs b/rust/schist_fakes/src/budget_drip.rs
new file mode 100644
index 0000000..f653565
--- /dev/null
+++ b/rust/schist_fakes/src/budget_drip.rs
@@ -0,0 +1,16 @@
+use schist_models::{budget_drip::{BudgetDrip, BudgetDripBuilder}, date_utc::DateUtc};
+use schist_traits::nowlike::Nowlike;
+
+pub fn make_fake_budget_drip(id: i32) -> BudgetDrip {
+    make_fake_budget_drip_builder(id).build().unwrap()
+}
+
+pub fn make_fake_budget_drip_builder(id: i32) -> BudgetDripBuilder {
+    let mut builder = BudgetDripBuilder::default();
+    builder
+        .id(id)
+        .category_id(0)
+        .date(DateUtc::now())
+        .quantity(0);
+    builder
+}
diff --git a/rust/schist_fakes/src/budget_update.rs b/rust/schist_fakes/src/budget_update.rs
deleted file mode 100644
index 2c8ba34..0000000
--- a/rust/schist_fakes/src/budget_update.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use schist_models::{budget_update::{BudgetUpdate, BudgetUpdateBuilder}, date_utc::DateUtc};
-use schist_traits::nowlike::Nowlike;
-
-pub fn make_fake_budget_update(id: i32) -> BudgetUpdate {
-    make_fake_budget_update_builder(id).build().unwrap()
-}
-
-pub fn make_fake_budget_update_builder(id: i32) ->  BudgetUpdateBuilder {
-    let mut builder = BudgetUpdateBuilder::default();
-    builder
-        .id(id)
-        .category_id(0)
-        .date(DateUtc::now())
-        .new_budget(0)
-        .new_period(0);
-    builder
-}
diff --git a/rust/schist_fakes/src/category.rs b/rust/schist_fakes/src/category.rs
index 39fddc7..c64818d 100644
--- a/rust/schist_fakes/src/category.rs
+++ b/rust/schist_fakes/src/category.rs
@@ -1,4 +1,5 @@
-use schist_models::category::{Category, CategoryBuilder};
+use schist_models::{budget_period_unit::BudgetPeriodUnit, category::{Category, CategoryBuilder}, date_utc::DateUtc};
+use schist_traits::nowlike::Nowlike;
 
 pub fn make_fake_category(id: i32) -> Category {
     make_fake_category_builder(id).build().unwrap()
@@ -8,6 +9,11 @@ pub fn make_fake_category_builder(id: i32) ->  CategoryBuilder {
     let mut builder = CategoryBuilder::default();
     builder
         .id(id)
-        .name(String::from("Fake category"));
+        .name(String::from("Fake category"))
+        .balance(0)
+        .balance_date(DateUtc::now())
+        .budget_period(0)
+        .budget_period_unit(BudgetPeriodUnit::Day)
+        .budget_quantity(0);
     builder
 }
diff --git a/rust/schist_fakes/src/lib.rs b/rust/schist_fakes/src/lib.rs
index 68f5209..2d865d7 100644
--- a/rust/schist_fakes/src/lib.rs
+++ b/rust/schist_fakes/src/lib.rs
@@ -1,5 +1,5 @@
 pub mod account;
-pub mod budget_update;
+pub mod budget_drip;
 pub mod category;
 pub mod category_transfer;
 pub mod transaction;
diff --git a/rust/schist_models/Cargo.toml b/rust/schist_models/Cargo.toml
index 6be4e21..a3e5021 100644
--- a/rust/schist_models/Cargo.toml
+++ b/rust/schist_models/Cargo.toml
@@ -13,4 +13,5 @@ schist_traits = { path = "../schist_traits" }
 serde = { workspace = true,  features = ["derive"] }
 
 [dev-dependencies]
+libsqlite3-sys = { workspace = true, features = ["bundled"] }
 schist_queries = { path = "../schist_queries" }
diff --git a/rust/schist_models/diesel.toml b/rust/schist_models/diesel.toml
new file mode 100644
index 0000000..2b8ebd8
--- /dev/null
+++ b/rust/schist_models/diesel.toml
@@ -0,0 +1,9 @@
+# For documentation on how to configure this file,
+# see https://diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/schema.rs"
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
+
+[migrations_directory]
+dir = "/home/joeac/src/schist/rust/schist_models/migrations"
diff --git a/rust/schist_models/migrations/2024-08-31-084439_initial_setup/down.sql b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/down.sql
index 8cf4b1e..b9b1675 100644
--- a/rust/schist_models/migrations/2024-08-31-084439_initial_setup/down.sql
+++ b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/down.sql
@@ -1,5 +1,5 @@
 DROP TABLE accounts;
-DROP TABLE budget_updates;
+DROP TABLE budget_drips;
 DROP TABLE categories;
 DROP TABLE transaction_categorisations;
 DROP TABLE category_transfers;
diff --git a/rust/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql
index 9038b54..a684ce7 100644
--- a/rust/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql
+++ b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql
@@ -7,22 +7,26 @@ CREATE TABLE accounts(
     opening_date TEXT NOT NULL
 );
 
-CREATE TABLE budget_updates(
+CREATE TABLE budget_drips(
     id INTEGER NOT NULL PRIMARY KEY,
     category_id INTEGER NOT NULL,
     date TEXT NOT NULL,
-    new_budget INTEGER NOT NULL,
-    new_period INTEGER NOT NULL,
-    UNIQUE (category_id, date),
+    quantity INTEGER NOT NULL,
     FOREIGN KEY (category_id)
         REFERENCES categories (id)
         ON UPDATE CASCADE
-        ON DELETE RESTRICT
+        ON DELETE RESTRICT,
+    UNIQUE(category_id, date)
 );
 
 CREATE TABLE categories(
     id INTEGER NOT NULL PRIMARY KEY,
-    name TEXT NOT NULL
+    name TEXT NOT NULL,
+    balance INTEGER NOT NULL,
+    balance_date TEXT NOT NULL,
+    budget_period INTEGER NOT NULL,
+    budget_period_unit TEXT NOT NULL,
+    budget_quantity INTEGER NOT NULL
 );
 
 CREATE TABLE category_transfers(
diff --git a/rust/schist_models/src/budget.rs b/rust/schist_models/src/budget.rs
deleted file mode 100644
index 03261e5..0000000
--- a/rust/schist_models/src/budget.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use serde::Serialize;
-
-use super::budget_update::BudgetUpdate;
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize)]
-pub struct Budget {
-    pub quantity: i32,
-    pub period: i32,
-}
-
-impl From<&BudgetUpdate> for Budget {
-    fn from(budget_update: &BudgetUpdate) -> Self {
-        Self {
-            quantity: budget_update.new_budget,
-            period: budget_update.new_period,
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::date_utc::DateUtc;
-    use schist_traits::nowlike::Nowlike;
-
-    use super::*;
-
-    #[test]
-    fn when_from_budget_update_then_returns_budget() {
-        let quantity = 2;
-        let period = 3;
-        let budget_update = BudgetUpdate {
-            id: 0,
-            category_id: 1,
-            date: DateUtc::now(),
-            new_budget: quantity,
-            new_period: period,
-        };
-
-        let budget = Budget::from(&budget_update);
-
-        assert_eq!(budget, Budget { quantity, period });
-    }
-}
diff --git a/rust/schist_models/src/budget_drip.rs b/rust/schist_models/src/budget_drip.rs
new file mode 100644
index 0000000..f467ecd
--- /dev/null
+++ b/rust/schist_models/src/budget_drip.rs
@@ -0,0 +1,14 @@
+use derive_builder::Builder;
+use diesel::prelude::{Identifiable, Insertable, Queryable, Selectable};
+use serde::{Deserialize, Serialize};
+
+use crate::date_utc::DateUtc;
+
+#[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Serialize, Deserialize, Insertable)]
+#[diesel(table_name = crate::schema::budget_drips)]
+pub struct BudgetDrip {
+    pub id: i32,
+    pub category_id: i32,
+    pub date: DateUtc,
+    pub quantity: i32,
+}
diff --git a/rust/schist_models/src/budget_period_unit.rs b/rust/schist_models/src/budget_period_unit.rs
new file mode 100644
index 0000000..77d8641
--- /dev/null
+++ b/rust/schist_models/src/budget_period_unit.rs
@@ -0,0 +1,112 @@
+use core::fmt;
+use std::str::FromStr;
+
+use anyhow::{Result, bail};
+use diesel::{backend::Backend, deserialize::{self, FromSql, FromSqlRow}, expression::AsExpression, serialize::{self, ToSql}, sql_types::Text, sqlite::Sqlite};
+use serde::{Deserialize, Serialize};
+
+#[derive(
+    Eq,
+    PartialEq,
+    Serialize,
+    Deserialize,
+    Clone,
+    Debug,
+    AsExpression,
+    FromSqlRow,
+)]
+#[diesel(sql_type=Text)]
+pub enum BudgetPeriodUnit {
+    Day,
+    Month,
+    Year,
+}
+
+impl fmt::Display for BudgetPeriodUnit {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BudgetPeriodUnit::Day => "DAY".fmt(f),
+            BudgetPeriodUnit::Month => "MONTH".fmt(f),
+            BudgetPeriodUnit::Year => "YEAR".fmt(f),
+        }
+    }
+}
+
+impl FromStr for BudgetPeriodUnit {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self> {
+        match s {
+            "DAY" => Ok(BudgetPeriodUnit::Day),
+            "MONTH" => Ok(BudgetPeriodUnit::Month),
+            "YEAR" => Ok(BudgetPeriodUnit::Year),
+            _ => bail!("\"{}\" is not a valid budget period unit. Valid values are: DAY, MONTH, YEAR", s),
+        }
+    }
+}
+
+impl ToSql<Text, Sqlite> for BudgetPeriodUnit {
+    fn to_sql<'b>(
+        &'b self,
+        out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
+    ) -> serialize::Result {
+        out.set_value(self.to_string());
+        Ok(serialize::IsNull::No)
+    }
+}
+
+impl FromSql<Text, Sqlite> for BudgetPeriodUnit {
+    fn from_sql(bytes: <Sqlite as Backend>::RawValue<'_>) -> deserialize::Result<BudgetPeriodUnit> {
+        let str = <String as FromSql<Text, Sqlite>>::from_sql(bytes)?;
+        Ok(str.parse()?)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use anyhow::Result;
+
+    use super::BudgetPeriodUnit;
+
+    #[test]
+    fn display_when_day_then_day() {
+        assert_eq!("DAY", format!("{}", BudgetPeriodUnit::Day));
+    }
+
+    #[test]
+    fn display_when_month_then_month() {
+        assert_eq!("MONTH", format!("{}", BudgetPeriodUnit::Month));
+    }
+
+    #[test]
+    fn display_when_year_then_year() {
+        assert_eq!("YEAR", format!("{}", BudgetPeriodUnit::Year));
+    }
+
+    #[test]
+    fn from_str_when_day_then_day() {
+        let result: Result<BudgetPeriodUnit> = "DAY".parse();
+        assert!(result.is_ok());
+        assert_eq!(BudgetPeriodUnit::Day, result.unwrap());
+    }
+
+    #[test]
+    fn from_str_when_month_then_month() {
+        let result: Result<BudgetPeriodUnit> = "MONTH".parse();
+        assert!(result.is_ok());
+        assert_eq!(BudgetPeriodUnit::Month, result.unwrap());
+    }
+
+    #[test]
+    fn from_str_when_year_then_year() {
+        let result: Result<BudgetPeriodUnit> = "YEAR".parse();
+        assert!(result.is_ok());
+        assert_eq!(BudgetPeriodUnit::Year, result.unwrap());
+    }
+
+    #[test]
+    fn from_str_when_sentence_case_day_then_err() {
+        let result: Result<BudgetPeriodUnit> = "Day".parse();
+        assert!(result.is_err());
+    }
+}
diff --git a/rust/schist_models/src/budget_update.rs b/rust/schist_models/src/budget_update.rs
deleted file mode 100644
index 86645cb..0000000
--- a/rust/schist_models/src/budget_update.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use derive_builder::Builder;
-use diesel::prelude::*;
-use serde::Serialize;
-
-use crate::{category::Category, date_utc::DateUtc};
-
-#[derive(Builder, Clone, Serialize, Queryable, Identifiable, Selectable, Associations, Debug, PartialEq, Eq, Insertable)]
-#[diesel(table_name = crate::schema::budget_updates)]
-#[diesel(belongs_to(Category))]
-pub struct BudgetUpdate {
-    pub id: i32,
-    pub category_id: i32,
-    pub date: DateUtc,
-    pub new_budget: i32,
-    pub new_period: i32,
-}
diff --git a/rust/schist_models/src/category.rs b/rust/schist_models/src/category.rs
index 55c7b97..c85ff51 100644
--- a/rust/schist_models/src/category.rs
+++ b/rust/schist_models/src/category.rs
@@ -2,9 +2,16 @@ use derive_builder::Builder;
 use diesel::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use crate::{budget_period_unit::BudgetPeriodUnit, date_utc::DateUtc};
+
 #[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Serialize, Deserialize, Insertable)]
 #[diesel(table_name = crate::schema::categories)]
 pub struct Category {
     pub id: i32,
     pub name: String,
+    pub balance: i32,
+    pub balance_date: DateUtc,
+    pub budget_period: i32,
+    pub budget_period_unit: BudgetPeriodUnit,
+    pub budget_quantity: i32,
 }
diff --git a/rust/schist_models/src/category_balance.rs b/rust/schist_models/src/category_balance.rs
deleted file mode 100644
index 796b40b..0000000
--- a/rust/schist_models/src/category_balance.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use serde::Serialize;
-
-#[derive(Serialize)]
-pub struct CategoryBalance {
-    pub category_id: i32,
-    pub balance: i32,
-}
diff --git a/rust/schist_models/src/category_budget.rs b/rust/schist_models/src/category_budget.rs
deleted file mode 100644
index 9796261..0000000
--- a/rust/schist_models/src/category_budget.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use serde::Serialize;
-
-use super::budget::Budget;
-
-#[derive(Serialize)]
-pub struct CategoryBudget {
-    pub category_id: i32,
-    pub budget: Option<Budget>,
-}
diff --git a/rust/schist_models/src/lib.rs b/rust/schist_models/src/lib.rs
index 9e60e80..1712c36 100644
--- a/rust/schist_models/src/lib.rs
+++ b/rust/schist_models/src/lib.rs
@@ -1,9 +1,7 @@
 pub mod account;
-pub mod budget;
-pub mod budget_update;
+pub mod budget_drip;
+pub mod budget_period_unit;
 pub mod category;
-pub mod category_balance;
-pub mod category_budget;
 pub mod category_transfer;
 pub mod date_utc;
 pub mod datetime_utc;
diff --git a/rust/schist_models/src/schema.rs b/rust/schist_models/src/schema.rs
index 372f8f3..5164d07 100644
--- a/rust/schist_models/src/schema.rs
+++ b/rust/schist_models/src/schema.rs
@@ -10,12 +10,11 @@ diesel::table! {
 }
 
 diesel::table! {
-    budget_updates (id) {
+    budget_drips (id) {
         id -> Integer,
         category_id -> Integer,
         date -> Text,
-        new_budget -> Integer,
-        new_period -> Integer,
+        quantity -> Integer,
     }
 }
 
@@ -23,6 +22,11 @@ diesel::table! {
     categories (id) {
         id -> Integer,
         name -> Text,
+        balance -> Integer,
+        balance_date -> Text,
+        budget_period -> Integer,
+        budget_period_unit -> Text,
+        budget_quantity -> Integer,
     }
 }
 
@@ -57,14 +61,14 @@ diesel::table! {
     }
 }
 
-diesel::joinable!(budget_updates -> categories (category_id));
+diesel::joinable!(budget_drips -> categories (category_id));
 diesel::joinable!(transaction_categorisations -> categories (category_id));
 diesel::joinable!(transaction_categorisations -> transactions (transaction_id));
 diesel::joinable!(transactions -> accounts (account_id));
 
 diesel::allow_tables_to_appear_in_same_query!(
     accounts,
-    budget_updates,
+    budget_drips,
     categories,
     category_transfers,
     transaction_categorisations,
diff --git a/rust/schist_models/tests/budget_period_unit.rs b/rust/schist_models/tests/budget_period_unit.rs
new file mode 100644
index 0000000..6e8928a
--- /dev/null
+++ b/rust/schist_models/tests/budget_period_unit.rs
@@ -0,0 +1,86 @@
+mod common;
+
+use anyhow::Result;
+use common::test_context::TestContext;
+use diesel::{sql_query, Connection, ExpressionMethods, QueryDsl, RunQueryDsl, Selectable, SelectableHelper, SqliteConnection};
+use diesel::prelude::{Insertable, Queryable};
+use schist_models::budget_period_unit::BudgetPeriodUnit;
+
+diesel::table! {
+    budget_period_unit_test (id) {
+        id -> Integer,
+        budget_period_unit -> Text,
+    }
+}
+
+#[derive(Insertable, Queryable, Selectable, Clone)]
+#[diesel(table_name = budget_period_unit_test)]
+pub struct BudgetPeriodUnitTest {
+    pub id: i32,
+    pub budget_period_unit: BudgetPeriodUnit,
+}
+
+fn new_test_context() -> Result<TestContext> {
+    let test_context = TestContext::new();
+    let connection = &mut SqliteConnection::establish(&test_context.db_url)?;
+    let query = "CREATE TABLE budget_period_unit_test(id INTEGER PRIMARY KEY, budget_period_unit TEXT);";
+    sql_query(query).execute(connection)?;
+    Ok(test_context)
+}
+
+fn insert_budget_period_unit(id: i32, budget_period_unit: &BudgetPeriodUnit, connection: &mut SqliteConnection) -> Result<usize> {
+    let model = BudgetPeriodUnitTest {
+        id,
+        budget_period_unit: budget_period_unit.clone(),
+    };
+    let num_rows_inserted = diesel::insert_into(budget_period_unit_test::dsl::budget_period_unit_test)
+        .values(&[model])
+        .execute(connection)?;
+    Ok(num_rows_inserted)
+}
+
+fn get_budget_period_unit(id: i32, connection: &mut SqliteConnection) -> Result<BudgetPeriodUnitTest> {
+    let budget_period_unit: Vec<BudgetPeriodUnitTest> = budget_period_unit_test::dsl::budget_period_unit_test
+        .select(BudgetPeriodUnitTest::as_select())
+        .filter(budget_period_unit_test::id.eq(id))
+        .load(connection)?;
+    Ok(budget_period_unit[0].clone())
+}
+
+#[test]
+fn when_insert_day_and_select_then_returns_day() {
+    let test_context = new_test_context().unwrap();
+    let connection = &mut SqliteConnection::establish(&test_context.db_url).unwrap();
+
+    let budget_period_unit = BudgetPeriodUnit::Day;
+    let num_rows_inserted = insert_budget_period_unit(0, &budget_period_unit, connection);
+
+    assert!(num_rows_inserted.is_ok());
+    let num_rows_inserted = num_rows_inserted.unwrap();
+    assert_eq!(num_rows_inserted, 1);
+
+    let budget_period_unit_returned = get_budget_period_unit(0, connection);
+
+    assert!(budget_period_unit_returned.is_ok());
+    let budget_period_unit_returned = budget_period_unit_returned.unwrap();
+    assert_eq!(BudgetPeriodUnit::Day, budget_period_unit_returned.budget_period_unit);
+}
+
+#[test]
+fn when_insert_month_and_select_then_returns_month() {
+    let test_context = new_test_context().unwrap();
+    let connection = &mut SqliteConnection::establish(&test_context.db_url).unwrap();
+
+    let budget_period_unit = BudgetPeriodUnit::Month;
+    let num_rows_inserted = insert_budget_period_unit(0, &budget_period_unit, connection);
+
+    assert!(num_rows_inserted.is_ok());
+    let num_rows_inserted = num_rows_inserted.unwrap();
+    assert_eq!(num_rows_inserted, 1);
+
+    let budget_period_unit_returned = get_budget_period_unit(0, connection);
+
+    assert!(budget_period_unit_returned.is_ok());
+    let budget_period_unit_returned = budget_period_unit_returned.unwrap();
+    assert_eq!(BudgetPeriodUnit::Month, budget_period_unit_returned.budget_period_unit);
+}
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;
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,
-        });
-    }
-}