summaryrefslogtreecommitdiff
path: root/schist_core/schist_models/src
diff options
context:
space:
mode:
Diffstat (limited to 'schist_core/schist_models/src')
-rw-r--r--schist_core/schist_models/src/bucket.rs (renamed from schist_core/schist_models/src/category.rs)16
-rw-r--r--schist_core/schist_models/src/bucket_transfer.rs (renamed from schist_core/schist_models/src/category_transfer.rs)2
-rw-r--r--schist_core/schist_models/src/lib.rs6
-rw-r--r--schist_core/schist_models/src/schema.rs1
4 files changed, 19 insertions, 6 deletions
diff --git a/schist_core/schist_models/src/category.rs b/schist_core/schist_models/src/bucket.rs
index e3c9938..f162405 100644
--- a/schist_core/schist_models/src/category.rs
+++ b/schist_core/schist_models/src/bucket.rs
@@ -4,9 +4,20 @@ use serde::{Deserialize, Serialize};
use crate::{budget_period_unit::BudgetPeriodUnit, date_utc::DateUtc};
-#[derive(Builder, Clone, Queryable, Identifiable, Selectable, Debug, PartialEq, Serialize, Deserialize, Insertable)]
+#[derive(
+ Builder,
+ Clone,
+ Queryable,
+ Identifiable,
+ Selectable,
+ Debug,
+ PartialEq,
+ Serialize,
+ Deserialize,
+ Insertable,
+)]
#[diesel(table_name = crate::schema::categories)]
-pub struct Category {
+pub struct Bucket {
pub id: i32,
pub name: String,
pub balance: i32,
@@ -14,4 +25,5 @@ pub struct Category {
pub budget_period: i32,
pub budget_period_unit: BudgetPeriodUnit,
pub budget_quantity: i32,
+ pub group: String,
}
diff --git a/schist_core/schist_models/src/category_transfer.rs b/schist_core/schist_models/src/bucket_transfer.rs
index 7b36054..5d2e268 100644
--- a/schist_core/schist_models/src/category_transfer.rs
+++ b/schist_core/schist_models/src/bucket_transfer.rs
@@ -3,7 +3,7 @@ use diesel::prelude::*;
#[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)]
#[diesel(table_name = crate::schema::category_transfers)]
-pub struct CategoryTransfer {
+pub struct BucketTransfer {
pub id: i32,
pub description: String,
pub quantity: i32,
diff --git a/schist_core/schist_models/src/lib.rs b/schist_core/schist_models/src/lib.rs
index d9e93c4..db5c593 100644
--- a/schist_core/schist_models/src/lib.rs
+++ b/schist_core/schist_models/src/lib.rs
@@ -1,12 +1,12 @@
pub mod account;
pub mod account_transfer;
+pub mod bucket;
+pub mod bucket_transfer;
pub mod budget_drip;
pub mod budget_period_unit;
-pub mod category;
-pub mod category_transfer;
pub mod date_utc;
pub mod datetime_utc;
pub mod migrations;
+pub mod schema;
pub mod transaction;
pub mod transaction_categorisation;
-pub mod schema;
diff --git a/schist_core/schist_models/src/schema.rs b/schist_core/schist_models/src/schema.rs
index 1dd1391..40af56f 100644
--- a/schist_core/schist_models/src/schema.rs
+++ b/schist_core/schist_models/src/schema.rs
@@ -38,6 +38,7 @@ diesel::table! {
budget_period -> Integer,
budget_period_unit -> Text,
budget_quantity -> Integer,
+ group -> Text,
}
}