summaryrefslogtreecommitdiff
path: root/backend/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'backend/core/src')
-rw-r--r--backend/core/src/models/account.rs2
-rw-r--r--backend/core/src/models/budget.rs2
-rw-r--r--backend/core/src/models/budget_update.rs3
-rw-r--r--backend/core/src/models/category.rs3
-rw-r--r--backend/core/src/models/category_transfer.rs3
-rw-r--r--backend/core/src/models/date_time_utc.rs106
-rw-r--r--backend/core/src/models/transaction.rs3
-rw-r--r--backend/core/src/models/transaction_categorisation.rs3
-rw-r--r--backend/core/src/queries/category_transfers/get_all.rs11
-rw-r--r--backend/core/src/queries/category_transfers/mod.rs2
-rw-r--r--backend/core/src/queries/clear.rs5
-rw-r--r--backend/core/src/queries/transaction_categorisations/get_all.rs11
-rw-r--r--backend/core/src/queries/transaction_categorisations/mod.rs2
-rw-r--r--backend/core/src/queries/transactions/get_all.rs11
-rw-r--r--backend/core/src/queries/transactions/mod.rs2
-rw-r--r--backend/core/src/utils/calculate_budgets_accrual.rs14
-rw-r--r--backend/core/src/utils/calculate_category_balance.rs4
17 files changed, 139 insertions, 48 deletions
diff --git a/backend/core/src/models/account.rs b/backend/core/src/models/account.rs
index c10bd5f..fcd5270 100644
--- a/backend/core/src/models/account.rs
+++ b/backend/core/src/models/account.rs
@@ -1,7 +1,7 @@
use diesel::prelude::*;
use serde::{Deserialize, Serialize};
-use super::date_time_utc::DateTimeUtc;
+use crate::models::date_time_utc::DateTimeUtc;
#[derive(
Insertable, Queryable, Identifiable, Selectable, Debug, PartialEq, Clone, Serialize, Deserialize,
diff --git a/backend/core/src/models/budget.rs b/backend/core/src/models/budget.rs
index cc18f2e..08a1c72 100644
--- a/backend/core/src/models/budget.rs
+++ b/backend/core/src/models/budget.rs
@@ -32,7 +32,7 @@ mod test {
let budget_update = BudgetUpdate {
id: 0,
category_id: 1,
- date: DateTimeUtc::new(Utc::now()),
+ date: DateTimeUtc::new(&Utc::now()),
new_budget: quantity,
new_period: period,
};
diff --git a/backend/core/src/models/budget_update.rs b/backend/core/src/models/budget_update.rs
index 8600419..3500d8e 100644
--- a/backend/core/src/models/budget_update.rs
+++ b/backend/core/src/models/budget_update.rs
@@ -1,3 +1,4 @@
+use derive_builder::Builder;
use diesel::prelude::*;
use serde::Serialize;
@@ -5,7 +6,7 @@ use crate::models::category::Category;
use super::date_time_utc::DateTimeUtc;
-#[derive(Clone, Serialize, Queryable, Identifiable, Selectable, Associations, Debug, PartialEq, Insertable)]
+#[derive(Builder, Clone, Serialize, Queryable, Identifiable, Selectable, Associations, Debug, PartialEq, Insertable)]
#[diesel(table_name = crate::schema::budget_updates)]
#[diesel(belongs_to(Category))]
pub struct BudgetUpdate {
diff --git a/backend/core/src/models/category.rs b/backend/core/src/models/category.rs
index 595cff6..55c7b97 100644
--- a/backend/core/src/models/category.rs
+++ b/backend/core/src/models/category.rs
@@ -1,7 +1,8 @@
+use derive_builder::Builder;
use diesel::prelude::*;
use serde::{Deserialize, Serialize};
-#[derive(Queryable, Identifiable, Selectable, Debug, PartialEq, Serialize, Deserialize, Insertable)]
+#[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Serialize, Deserialize, Insertable)]
#[diesel(table_name = crate::schema::categories)]
pub struct Category {
pub id: i32,
diff --git a/backend/core/src/models/category_transfer.rs b/backend/core/src/models/category_transfer.rs
index a048a07..7b36054 100644
--- a/backend/core/src/models/category_transfer.rs
+++ b/backend/core/src/models/category_transfer.rs
@@ -1,6 +1,7 @@
+use derive_builder::Builder;
use diesel::prelude::*;
-#[derive(Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)]
+#[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)]
#[diesel(table_name = crate::schema::category_transfers)]
pub struct CategoryTransfer {
pub id: i32,
diff --git a/backend/core/src/models/date_time_utc.rs b/backend/core/src/models/date_time_utc.rs
index 52c0cc6..d59d8f4 100644
--- a/backend/core/src/models/date_time_utc.rs
+++ b/backend/core/src/models/date_time_utc.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{Error, Result};
use chrono::{DateTime, Datelike, Utc};
use diesel::{
backend::Backend,
@@ -17,40 +17,88 @@ use serde::{Deserialize, Serialize};
PartialOrd,
Serialize,
Deserialize,
- Copy,
Clone,
Debug,
AsExpression,
FromSqlRow,
)]
#[diesel(sql_type=Text)]
-pub struct DateTimeUtc(DateTime<Utc>);
+pub struct DateTimeUtc {
+ chrono_datetime_utc: DateTime<Utc>,
+}
impl DateTimeUtc {
pub fn day_diff(&self, other: &DateTimeUtc) -> u32 {
- self.0
+ self.chrono_datetime_utc
.num_days_from_ce()
- .abs_diff(other.0.num_days_from_ce())
+ .abs_diff(other.chrono_datetime_utc.num_days_from_ce())
}
- pub fn to_day_str(&self) -> String {
- self.0
- .to_rfc3339()
- .split_at_checked(10)
- .map(|(day_str, _)| String::from(day_str))
- .unwrap_or_else(|| String::from(""))
+ pub fn new(chrono_datetime_utc: &DateTime<Utc>) -> Self {
+ Self {
+ chrono_datetime_utc: chrono_datetime_utc.clone(),
+ }
}
- pub fn new(date_time_utc: DateTime<Utc>) -> Self {
- Self(date_time_utc)
+ pub fn now() -> Self {
+ Self::new(&Utc::now())
}
+ /// Constructs DateTimeUtc from a day string, YYYY-MM-DD, in UTC
+ /// Example: "2024-10-24" -> Midnight 24 Oct 2024 UTC
+ pub fn from_day_str(day_str: &str) -> Result<Self> {
+ if !Self::is_day_str(day_str) {
+ Err(Error::msg(format!("{} is not a day string in YYYY-MM-DD format", day_str)))
+ } else {
+ let mut date_str = String::from(day_str);
+ date_str.push_str("T00:00:00.000Z");
+ Ok(Self::from_date_str(&date_str)?)
+ }
+ }
+
+ /// Constructs DateTimeUtc from a date string in ISO format, in UTC
+ /// Example: "2024-10-24T10:30:00.000" -> 10.30am 24 Oct 2024 UTC
pub fn from_date_str(date_time_utc: &str) -> Result<Self> {
- Ok(Self(date_time_utc.parse::<DateTime<Utc>>()?))
+ let chrono_datetime_utc = date_time_utc.parse::<DateTime<Utc>>()?;
+ Ok(Self {
+ chrono_datetime_utc,
+ })
}
- pub fn now() -> Self {
- Self(Utc::now())
+ /// Converts to a day string, YYYY-MM-DD, in UTC
+ /// Example: 10.30am 24 Oct 2024 UTC -> "2024-10-24"
+ pub fn to_day_str(&self) -> String {
+ let date_str = self.to_date_str();
+ let day_str = date_str
+ .split_at_checked(10)
+ .unwrap()
+ .0;
+ String::from(day_str)
+ }
+
+ /// Converts to a date string in ISO format, in UTC
+ /// Example: 10.30am 24 Oct 2024 UTC -> "2024-10-24T10:30:00.000Z"
+ pub fn to_date_str(&self) -> String {
+ self.chrono_datetime_utc.to_rfc3339()
+ }
+
+
+ fn is_day_str(str: &str) -> bool {
+ if str.len() != 10 {
+ return false;
+ }
+ for (ix, ch) in str.chars().enumerate() {
+ if ix == 4 || ix == 7 {
+ if ch != '-' {
+ return false;
+ }
+ } else {
+ if ch < '0' || ch > '9' {
+ return false;
+ }
+ }
+ }
+ return true;
}
}
@@ -59,16 +107,15 @@ impl ToSql<Text, Sqlite> for DateTimeUtc {
&'b self,
out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
) -> serialize::Result {
- out.set_value(self.to_day_str());
- Ok(diesel::serialize::IsNull::No)
+ out.set_value(self.to_date_str());
+ Ok(serialize::IsNull::No)
}
}
impl FromSql<Text, Sqlite> for DateTimeUtc {
fn from_sql(bytes: <Sqlite as Backend>::RawValue<'_>) -> deserialize::Result<DateTimeUtc> {
- let str: String = FromSql::<Text, Sqlite>::from_sql(bytes)?;
- let date_time = str.as_str().parse::<DateTime<Utc>>()?;
- Ok(DateTimeUtc(date_time))
+ let str = <String as FromSql<Text, Sqlite>>::from_sql(bytes)?;
+ Ok(Self::from_date_str(&str)?)
}
}
@@ -80,9 +127,9 @@ mod test {
#[test]
fn given_midnight_when_day_diff_next_midnight_less_1s_then_return_0() {
- let start = DateTimeUtc::new(Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap().to_utc());
+ let start = DateTimeUtc::new(&Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap().to_utc());
let end = DateTimeUtc::new(
- Utc.with_ymd_and_hms(2000, 1, 1, 23, 59, 59)
+ &Utc.with_ymd_and_hms(2000, 1, 1, 23, 59, 59)
.unwrap()
.to_utc(),
);
@@ -96,8 +143,8 @@ mod test {
#[test]
fn given_midnight_when_day_diff_next_midnight_then_return_1() {
- let start = DateTimeUtc::new(Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap().to_utc());
- let end = DateTimeUtc::new(Utc.with_ymd_and_hms(2000, 1, 2, 0, 0, 0).unwrap().to_utc());
+ let start = DateTimeUtc::new(&Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap().to_utc());
+ let end = DateTimeUtc::new(&Utc.with_ymd_and_hms(2000, 1, 2, 0, 0, 0).unwrap().to_utc());
let day_diff = start.day_diff(&end);
let neg_day_diff = end.day_diff(&start);
@@ -109,11 +156,11 @@ mod test {
#[test]
fn given_midnight_less_1s_when_day_diff_midnight_then_return_1() {
let start = DateTimeUtc::new(
- Utc.with_ymd_and_hms(2000, 1, 1, 23, 59, 59)
+ &Utc.with_ymd_and_hms(2000, 1, 1, 23, 59, 59)
.unwrap()
.to_utc(),
);
- let end = DateTimeUtc::new(Utc.with_ymd_and_hms(2000, 1, 2, 0, 0, 0).unwrap().to_utc());
+ let end = DateTimeUtc::new(&Utc.with_ymd_and_hms(2000, 1, 2, 0, 0, 0).unwrap().to_utc());
let day_diff = start.day_diff(&end);
let neg_day_diff = end.day_diff(&start);
@@ -125,12 +172,11 @@ mod test {
#[test]
fn given_23_nov_1970_when_to_day_str_then_return_iso_day_str() {
let date_time_utc = DateTimeUtc::new(
- Utc.with_ymd_and_hms(1970, 11, 23, 0, 0, 0)
+ &Utc.with_ymd_and_hms(1970, 11, 23, 0, 0, 0)
.unwrap()
.to_utc(),
);
- let day_str = date_time_utc.to_day_str();
- assert_eq!(day_str, "1970-11-23");
+ assert_eq!(date_time_utc.to_day_str(), "1970-11-23");
}
}
diff --git a/backend/core/src/models/transaction.rs b/backend/core/src/models/transaction.rs
index 5f85689..edfabce 100644
--- a/backend/core/src/models/transaction.rs
+++ b/backend/core/src/models/transaction.rs
@@ -1,10 +1,11 @@
+use derive_builder::Builder;
use diesel::prelude::*;
use crate::models::account::Account;
use super::date_time_utc::DateTimeUtc;
-#[derive(Queryable, Identifiable, Selectable, Insertable, Associations, Debug, PartialEq)]
+#[derive(Builder, Queryable, Identifiable, Selectable, Insertable, Associations, Debug, PartialEq)]
#[diesel(table_name = crate::schema::transactions)]
#[diesel(belongs_to(Account))]
pub struct Transaction {
diff --git a/backend/core/src/models/transaction_categorisation.rs b/backend/core/src/models/transaction_categorisation.rs
index 45591a5..c6ac6ea 100644
--- a/backend/core/src/models/transaction_categorisation.rs
+++ b/backend/core/src/models/transaction_categorisation.rs
@@ -1,6 +1,7 @@
+use derive_builder::Builder;
use diesel::prelude::*;
-#[derive(Queryable, Identifiable, Selectable, Insertable, Debug, PartialEq)]
+#[derive(Builder, Queryable, Identifiable, Selectable, Insertable, Debug, PartialEq)]
#[diesel(table_name = crate::schema::transaction_categorisations)]
pub struct TransactionCategorisation {
pub id: i32,
diff --git a/backend/core/src/queries/category_transfers/get_all.rs b/backend/core/src/queries/category_transfers/get_all.rs
new file mode 100644
index 0000000..73d7e10
--- /dev/null
+++ b/backend/core/src/queries/category_transfers/get_all.rs
@@ -0,0 +1,11 @@
+use anyhow::{Context, Result};
+use crate::{models::category_transfer::CategoryTransfer, schema::category_transfers::dsl::category_transfers as category_transfers_table};
+use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
+
+pub fn get_all_category_transfers(connection: &mut SqliteConnection) -> Result<Vec<CategoryTransfer>> {
+ let all_category_transfers = category_transfers_table
+ .select(CategoryTransfer::as_select())
+ .load(connection)
+ .with_context(|| "failed to get all category transfers")?;
+ Ok(all_category_transfers)
+}
diff --git a/backend/core/src/queries/category_transfers/mod.rs b/backend/core/src/queries/category_transfers/mod.rs
index 68f32f4..eed7946 100644
--- a/backend/core/src/queries/category_transfers/mod.rs
+++ b/backend/core/src/queries/category_transfers/mod.rs
@@ -1,9 +1,11 @@
mod delete_all;
+mod get_all;
mod insert;
mod sum_quantity_per_from_category_id;
mod sum_quantity_per_to_category_id;
pub use delete_all::delete_all_category_transfers;
+pub use get_all::get_all_category_transfers;
pub use insert::insert_category_transfers;
pub use sum_quantity_per_from_category_id::sum_category_transfer_quantity_per_from_category_id;
pub use sum_quantity_per_to_category_id::sum_category_transfer_quantity_per_to_category_id;
diff --git a/backend/core/src/queries/clear.rs b/backend/core/src/queries/clear.rs
index dbe0f84..e704634 100644
--- a/backend/core/src/queries/clear.rs
+++ b/backend/core/src/queries/clear.rs
@@ -1,3 +1,4 @@
+use anyhow::Result;
use crate::queries::{
accounts::delete_all_accounts,
budget_updates::delete_all_budget_updates,
@@ -6,9 +7,9 @@ use crate::queries::{
transactions::delete_all_transactions,
transaction_categorisations::delete_all_transaction_categorisations,
};
-use diesel::{result::Error, SqliteConnection};
+use diesel::SqliteConnection;
-pub fn clear(connection: &mut SqliteConnection) -> Result<(), Error> {
+pub fn clear(connection: &mut SqliteConnection) -> Result<()> {
delete_all_accounts(connection)?;
delete_all_budget_updates(connection)?;
delete_all_categories(connection)?;
diff --git a/backend/core/src/queries/transaction_categorisations/get_all.rs b/backend/core/src/queries/transaction_categorisations/get_all.rs
new file mode 100644
index 0000000..0cacfe6
--- /dev/null
+++ b/backend/core/src/queries/transaction_categorisations/get_all.rs
@@ -0,0 +1,11 @@
+use anyhow::{Context, Result};
+use crate::{models::transaction_categorisation::TransactionCategorisation, schema::transaction_categorisations::dsl::transaction_categorisations as transaction_categorisations_table};
+use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
+
+pub fn get_all_transaction_categorisations(connection: &mut SqliteConnection) -> Result<Vec<TransactionCategorisation>> {
+ let all_transaction_categorisations = transaction_categorisations_table
+ .select(TransactionCategorisation::as_select())
+ .load(connection)
+ .with_context(|| "failed to get all transaction categorisations")?;
+ Ok(all_transaction_categorisations)
+}
diff --git a/backend/core/src/queries/transaction_categorisations/mod.rs b/backend/core/src/queries/transaction_categorisations/mod.rs
index 3664fa6..d383791 100644
--- a/backend/core/src/queries/transaction_categorisations/mod.rs
+++ b/backend/core/src/queries/transaction_categorisations/mod.rs
@@ -1,7 +1,9 @@
mod delete_all;
+mod get_all;
mod insert;
mod sum_quantity_per_category_id;
pub use delete_all::delete_all_transaction_categorisations;
+pub use get_all::get_all_transaction_categorisations;
pub use insert::insert_transaction_categorisations;
pub use sum_quantity_per_category_id::sum_transaction_categorisation_quantity_per_category_id;
diff --git a/backend/core/src/queries/transactions/get_all.rs b/backend/core/src/queries/transactions/get_all.rs
new file mode 100644
index 0000000..afb87f4
--- /dev/null
+++ b/backend/core/src/queries/transactions/get_all.rs
@@ -0,0 +1,11 @@
+use anyhow::{Context, Result};
+use crate::{models::transaction::Transaction, schema::transactions::dsl::transactions as transactions_table};
+use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
+
+pub fn get_all_transactions(connection: &mut SqliteConnection) -> Result<Vec<Transaction>> {
+ let all_transactions = transactions_table
+ .select(Transaction::as_select())
+ .load(connection)
+ .with_context(|| "failed to get all category transfers")?;
+ Ok(all_transactions)
+}
diff --git a/backend/core/src/queries/transactions/mod.rs b/backend/core/src/queries/transactions/mod.rs
index 40855f3..983e9af 100644
--- a/backend/core/src/queries/transactions/mod.rs
+++ b/backend/core/src/queries/transactions/mod.rs
@@ -1,5 +1,7 @@
mod delete_all;
+mod get_all;
mod insert;
pub use delete_all::delete_all_transactions;
+pub use get_all::get_all_transactions;
pub use insert::insert_transactions;
diff --git a/backend/core/src/utils/calculate_budgets_accrual.rs b/backend/core/src/utils/calculate_budgets_accrual.rs
index bbc197c..22061ee 100644
--- a/backend/core/src/utils/calculate_budgets_accrual.rs
+++ b/backend/core/src/utils/calculate_budgets_accrual.rs
@@ -9,7 +9,7 @@ pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUp
.iter()
.filter(|bu| bu.category_id == category.id)
.collect::<Vec<&BudgetUpdate>>();
- budget_updates.sort_by_key(|bu| bu.date);
+ budget_updates.sort_by_key(|bu| bu.date.clone());
budget_updates.reverse();
let mut budgets_accrual = 0.0_f64;
@@ -22,7 +22,7 @@ pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUp
}
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;
+ calculated_back_to_date = budget_update.date.clone();
}
budgets_accrual.floor() as i64
@@ -78,7 +78,7 @@ mod test {
let budget_updates = [BudgetUpdate {
id: 0,
category_id: 0,
- date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()),
+ date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()),
new_budget: 100,
new_period: 1,
}];
@@ -98,14 +98,14 @@ mod test {
BudgetUpdate {
id: 0,
category_id: 0,
- date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(60)).unwrap()),
+ date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(60)).unwrap()),
new_budget: 200,
new_period: 1,
},
BudgetUpdate {
id: 0,
category_id: 0,
- date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()),
+ date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()),
new_budget: 100,
new_period: 1,
},
@@ -127,7 +127,7 @@ mod test {
id: 0,
category_id: 0,
date: DateTimeUtc::new(
- Utc::now()
+ &Utc::now()
.checked_sub_days(Days::new(120))
.unwrap()
.with_hour(13)
@@ -140,7 +140,7 @@ mod test {
id: 0,
category_id: 0,
date: DateTimeUtc::new(
- Utc::now()
+ &Utc::now()
.checked_sub_days(Days::new(120))
.unwrap()
.with_hour(12)
diff --git a/backend/core/src/utils/calculate_category_balance.rs b/backend/core/src/utils/calculate_category_balance.rs
index 5eca05b..e461cee 100644
--- a/backend/core/src/utils/calculate_category_balance.rs
+++ b/backend/core/src/utils/calculate_category_balance.rs
@@ -51,7 +51,7 @@ mod test {
let budget_updates = [BudgetUpdate {
id: 0,
category_id: 1,
- date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()),
+ date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()),
new_budget: 77,
new_period: 1,
}];
@@ -123,7 +123,7 @@ mod test {
let budget_updates = [BudgetUpdate {
id: 0,
category_id: 0,
- date: DateTimeUtc::new(Utc::now().checked_sub_days(Days::new(120)).unwrap()),
+ date: DateTimeUtc::new(&Utc::now().checked_sub_days(Days::new(120)).unwrap()),
new_budget: 77,
new_period: 1,
}];
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-08 17:10:06 +0000