task-072

Co-authored-by: Joe Carstairs <jcarstairs@scottlogic.com>
Reviewed-on: https://git.joeac.net/joeac/schist/pulls/3
Co-authored-by: Joe Carstairs <me@joeac.net>
Co-committed-by: Joe Carstairs <me@joeac.net>

6 files changed, 18 insertions, 57 deletions

diff --git a/schist_core/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql b/schist_core/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql
index 275f280..b37c626 100644
--- a/schist_core/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql
+++ b/schist_core/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql
@@ -66,7 +66,8 @@ CREATE TABLE pipes(
     id INTEGER NOT NULL PRIMARY KEY,
     amount INTEGER NOT NULL,
     bucket_id INTEGER NOT NULL,
-    period TEXT NOT NULL,
+    period_length INTEGER NOT NULL,
+    period_unit TEXT NOT NULL,
     start_date TEXT NOT NULL,
     FOREIGN KEY (bucket_id)
         REFERENCES buckets (id)
diff --git a/schist_core/schist_models/migrations/2025-08-15-090859_dummy_data/down.sql b/schist_core/schist_models/migrations/2025-08-15-090859_dummy_data/down.sql
deleted file mode 100644
index 8050572..0000000
--- a/schist_core/schist_models/migrations/2025-08-15-090859_dummy_data/down.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-DELETE FROM accounts
-    WHERE id=0
-    AND name="Nationwide bank account"
-    AND opening_balance=0
-    AND opening_date="2024-01-01";
-
-DELETE FROM accounts
-    WHERE id=1
-    AND name="cash account"
-    AND opening_balance=0
-    AND opening_date="2024-01-01";
-
-DELETE FROM accounts
-    WHERE id=2
-    AND name="YBS savings account"
-    AND opening_balance=0
-    AND opening_date="2024-01-01";
-
-DELETE FROM buckets
-    WHERE id=0
-    AND balance IS NULL
-    AND balance_cache_key IS NULL
-    AND bucket_group="normal expenses"
-    AND name="groceries";
-
-DELETE FROM buckets
-    WHERE id=1
-    AND balance IS NULL
-    AND balance_cache_key IS NULL
-    AND bucket_group="luxuries"
-    AND name="bevvy";
-
-DELETE FROM buckets
-    WHERE id=2
-    AND balance IS NULL
-    AND balance_cache_key IS NULL
-    AND bucket_group="income"
-    AND name="salary";
-
diff --git a/schist_core/schist_models/migrations/2025-08-15-090859_dummy_data/up.sql b/schist_core/schist_models/migrations/2025-08-15-090859_dummy_data/up.sql
deleted file mode 100644
index f5c97d0..0000000
--- a/schist_core/schist_models/migrations/2025-08-15-090859_dummy_data/up.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-INSERT INTO accounts
-    (id, name, opening_balance, opening_date)
-    VALUES
-    (0, "Nationwide bank account", 0, "2024-01-01"),
-    (1, "cash account", 0, "2024-01-01"),
-    (2, "YBS savings account", 0, "2024-01-01");
-
-INSERT INTO buckets
-    (id, balance, balance_cache_key, bucket_group, name)
-    VALUES
-    (0, NULL, NULL, "normal expenses", "groceries"),
-    (1, NULL, NULL, "luxuries", "bevvy"),
-    (2, NULL, NULL, "income", "salary");
-
diff --git a/schist_core/schist_models/src/bucket.rs b/schist_core/schist_models/src/bucket.rs
index 1a78628..a28aa8f 100644
--- a/schist_core/schist_models/src/bucket.rs
+++ b/schist_core/schist_models/src/bucket.rs
@@ -2,6 +2,8 @@ use derive_builder::Builder;
 use diesel::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use crate::{Drip, Transaction};
+
 #[derive(
     Builder,
     Clone,
@@ -19,7 +21,16 @@ pub struct Bucket {
     pub id: i32,
     pub balance: Option<i32>,
     pub balance_cache_key: Option<String>,
-    #[column_name = "bucket_group"]
+    #[diesel(column_name = "bucket_group")]
     pub group: String,
     pub name: String,
 }
+
+impl Bucket {
+    pub fn is_empty(&self, drips: &[Drip], transactions: &[Transaction]) -> bool {
+        drips.iter().all(|drip| drip.bucket_id != self.id)
+            && transactions
+                .iter()
+                .all(|t| t.bucket_id.is_none_or(|id| id != self.id))
+    }
+}
diff --git a/schist_core/schist_models/src/pipe.rs b/schist_core/schist_models/src/pipe.rs
index fb66a20..9354c20 100644
--- a/schist_core/schist_models/src/pipe.rs
+++ b/schist_core/schist_models/src/pipe.rs
@@ -22,6 +22,7 @@ pub struct Pipe {
     pub id: i32,
     pub amount: i32,
     pub bucket_id: i32,
-    pub period: BudgetPeriodUnit,
+    pub period_length: i32,
+    pub period_unit: BudgetPeriodUnit,
     pub start_date: DateUtc,
 }
diff --git a/schist_core/schist_models/src/schema.rs b/schist_core/schist_models/src/schema.rs
index 3799479..d16e636 100644
--- a/schist_core/schist_models/src/schema.rs
+++ b/schist_core/schist_models/src/schema.rs
@@ -56,7 +56,8 @@ diesel::table! {
         id -> Integer,
         amount -> Integer,
         bucket_id -> Integer,
-        period -> Text,
+        period_length -> Integer,
+        period_unit -> Text,
         start_date -> Text,
     }
 }