From 1056421dd45b7e9af6f63a95026cb069cfa34e29 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Fri, 9 Jan 2026 18:13:36 +0000 Subject: improves balance format/style --- schist_core/schist_models/src/bucket.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'schist_core/schist_models/src') diff --git a/schist_core/schist_models/src/bucket.rs b/schist_core/schist_models/src/bucket.rs index a28aa8f..67ed31e 100644 --- a/schist_core/schist_models/src/bucket.rs +++ b/schist_core/schist_models/src/bucket.rs @@ -1,3 +1,5 @@ +use std::ops::Div; + use derive_builder::Builder; use diesel::prelude::*; use serde::{Deserialize, Serialize}; @@ -34,3 +36,14 @@ impl Bucket { .all(|t| t.bucket_id.is_none_or(|id| id != self.id)) } } + +impl Bucket { + pub fn pretty_balance_per_100(&self) -> String { + let abs_balance_per_100 = self.balance.unwrap_or(0).div(100).abs(); + if self.balance.is_none_or(|balance| balance >= 0) { + abs_balance_per_100.to_string() + } else { + format!("({abs_balance_per_100})") + } + } +} -- cgit v1.2.3 From 2809e6a2ef3ea636f3de5873f6c874923b410400 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Thu, 15 Jan 2026 22:35:39 +0000 Subject: renames categories -> buckets, refactors category_transfers -> bucket_transactions --- schist_core/schist_models/src/bucket.rs | 2 -- schist_core/schist_models/src/bucket_transaction.rs | 11 +++++++++++ schist_core/schist_models/src/bucket_transfer.rs | 12 ------------ schist_core/schist_models/src/lib.rs | 4 ++-- schist_core/schist_models/src/schema.rs | 8 ++++---- 5 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 schist_core/schist_models/src/bucket_transaction.rs delete mode 100644 schist_core/schist_models/src/bucket_transfer.rs (limited to 'schist_core/schist_models/src') diff --git a/schist_core/schist_models/src/bucket.rs b/schist_core/schist_models/src/bucket.rs index 67ed31e..debbab7 100644 --- a/schist_core/schist_models/src/bucket.rs +++ b/schist_core/schist_models/src/bucket.rs @@ -35,9 +35,7 @@ impl Bucket { .iter() .all(|t| t.bucket_id.is_none_or(|id| id != self.id)) } -} -impl Bucket { pub fn pretty_balance_per_100(&self) -> String { let abs_balance_per_100 = self.balance.unwrap_or(0).div(100).abs(); if self.balance.is_none_or(|balance| balance >= 0) { diff --git a/schist_core/schist_models/src/bucket_transaction.rs b/schist_core/schist_models/src/bucket_transaction.rs new file mode 100644 index 0000000..2aeae8a --- /dev/null +++ b/schist_core/schist_models/src/bucket_transaction.rs @@ -0,0 +1,11 @@ +use derive_builder::Builder; +use diesel::prelude::*; + +#[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)] +#[diesel(table_name = crate::schema::bucket_transactions)] +pub struct BucketTransaction { + pub id: i32, + pub amount: i32, + pub bucket_id: i32, + pub description: String, +} diff --git a/schist_core/schist_models/src/bucket_transfer.rs b/schist_core/schist_models/src/bucket_transfer.rs deleted file mode 100644 index 7c3a9d2..0000000 --- a/schist_core/schist_models/src/bucket_transfer.rs +++ /dev/null @@ -1,12 +0,0 @@ -use derive_builder::Builder; -use diesel::prelude::*; - -#[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)] -#[diesel(table_name = crate::schema::bucket_transfers)] -pub struct BucketTransfer { - pub id: i32, - pub amount: i32, - pub description: String, - pub from_bucket_id: i32, - pub to_bucket_id: i32, -} diff --git a/schist_core/schist_models/src/lib.rs b/schist_core/schist_models/src/lib.rs index 3aa4733..2a119cb 100644 --- a/schist_core/schist_models/src/lib.rs +++ b/schist_core/schist_models/src/lib.rs @@ -1,7 +1,7 @@ mod account; mod account_transfer; mod bucket; -mod bucket_transfer; +mod bucket_transaction; mod budget_period_unit; mod date_utc; mod datetime_utc; @@ -15,7 +15,7 @@ pub mod schema; pub use account::Account; pub use account_transfer::{AccountTransfer, AccountTransferBuilder}; pub use bucket::{Bucket, BucketBuilder}; -pub use bucket_transfer::{BucketTransfer, BucketTransferBuilder}; +pub use bucket_transaction::{BucketTransaction, BucketTransactionBuilder}; pub use budget_period_unit::BudgetPeriodUnit; pub use date_utc::DateUtc; pub use datetime_utc::DatetimeUtc; diff --git a/schist_core/schist_models/src/schema.rs b/schist_core/schist_models/src/schema.rs index d16e636..8744696 100644 --- a/schist_core/schist_models/src/schema.rs +++ b/schist_core/schist_models/src/schema.rs @@ -21,12 +21,11 @@ diesel::table! { } diesel::table! { - bucket_transfers (id) { + bucket_transactions (id) { id -> Integer, amount -> Integer, + bucket_id -> Integer, description -> Text, - from_bucket_id -> Integer, - to_bucket_id -> Integer, } } @@ -74,6 +73,7 @@ diesel::table! { } } +diesel::joinable!(bucket_transactions -> buckets (bucket_id)); diesel::joinable!(drips -> buckets (bucket_id)); diesel::joinable!(pipes -> buckets (bucket_id)); diesel::joinable!(transactions -> accounts (account_id)); @@ -81,7 +81,7 @@ diesel::joinable!(transactions -> accounts (account_id)); diesel::allow_tables_to_appear_in_same_query!( account_transfers, accounts, - bucket_transfers, + bucket_transactions, buckets, drips, pipes, -- cgit v1.2.3 From 76ba747912a391d235a9c4456e1d813dee9712f3 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sat, 17 Jan 2026 07:50:42 +0000 Subject: Publicise DateUtc::first_day_in_month and DateUtc::first_day_in_next_month --- schist_core/schist_models/src/date_utc.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'schist_core/schist_models/src') diff --git a/schist_core/schist_models/src/date_utc.rs b/schist_core/schist_models/src/date_utc.rs index 18a894b..927644c 100644 --- a/schist_core/schist_models/src/date_utc.rs +++ b/schist_core/schist_models/src/date_utc.rs @@ -105,7 +105,7 @@ impl DateUtc { return true; } - fn first_day_in_next_month(&self) -> Self { + pub fn first_day_in_next_month(&self) -> Self { let month = self.month(); let mut curr_guess: Option> = None; let mut curr_add = 1; @@ -120,7 +120,7 @@ impl DateUtc { }; } - fn first_day_in_month(&self) -> Self { + pub fn first_day_in_month(&self) -> Self { let month = self.month(); let mut prev_guess = self.clone(); let mut curr_guess = self.clone(); -- cgit v1.2.3 From 0971a7a4e847a5ae935c164d8d63c18d803ddc70 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sat, 17 Jan 2026 08:34:18 +0000 Subject: BucketTransaction has date field --- schist_core/schist_models/src/bucket_transaction.rs | 3 +++ schist_core/schist_models/src/schema.rs | 1 + 2 files changed, 4 insertions(+) (limited to 'schist_core/schist_models/src') diff --git a/schist_core/schist_models/src/bucket_transaction.rs b/schist_core/schist_models/src/bucket_transaction.rs index 2aeae8a..a956d0b 100644 --- a/schist_core/schist_models/src/bucket_transaction.rs +++ b/schist_core/schist_models/src/bucket_transaction.rs @@ -1,11 +1,14 @@ use derive_builder::Builder; use diesel::prelude::*; +use crate::date_utc::DateUtc; + #[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)] #[diesel(table_name = crate::schema::bucket_transactions)] pub struct BucketTransaction { pub id: i32, pub amount: i32, pub bucket_id: i32, + pub date: DateUtc, pub description: String, } diff --git a/schist_core/schist_models/src/schema.rs b/schist_core/schist_models/src/schema.rs index 8744696..9579e5c 100644 --- a/schist_core/schist_models/src/schema.rs +++ b/schist_core/schist_models/src/schema.rs @@ -25,6 +25,7 @@ diesel::table! { id -> Integer, amount -> Integer, bucket_id -> Integer, + date -> Text, description -> Text, } } -- cgit v1.2.3