summaryrefslogtreecommitdiff
path: root/backend/core/src/models
diff options
context:
space:
mode:
Diffstat (limited to 'backend/core/src/models')
-rw-r--r--backend/core/src/models/account.rs15
-rw-r--r--backend/core/src/models/budget.rs42
-rw-r--r--backend/core/src/models/budget_update.rs16
-rw-r--r--backend/core/src/models/category.rs10
-rw-r--r--backend/core/src/models/category_balance.rs7
-rw-r--r--backend/core/src/models/category_budget.rs9
-rw-r--r--backend/core/src/models/category_transfer.rs12
-rw-r--r--backend/core/src/models/date_utc.rs309
-rw-r--r--backend/core/src/models/datetime_utc.rs223
-rw-r--r--backend/core/src/models/mod.rs11
-rw-r--r--backend/core/src/models/transaction.rs18
-rw-r--r--backend/core/src/models/transaction_categorisation.rs12
12 files changed, 0 insertions, 684 deletions
diff --git a/backend/core/src/models/account.rs b/backend/core/src/models/account.rs
deleted file mode 100644
index 2df43e1..0000000
--- a/backend/core/src/models/account.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use diesel::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::models::datetime_utc::DatetimeUtc;
-
-#[derive(
- Insertable, Queryable, Identifiable, Selectable, Debug, PartialEq, Clone, Serialize, Deserialize,
-)]
-#[diesel(table_name = crate::schema::accounts)]
-pub struct Account {
- pub id: i32,
- pub name: String,
- pub opening_balance: i32,
- pub opening_date: DatetimeUtc,
-}
diff --git a/backend/core/src/models/budget.rs b/backend/core/src/models/budget.rs
deleted file mode 100644
index e6fb4c9..0000000
--- a/backend/core/src/models/budget.rs
+++ /dev/null
@@ -1,42 +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::{models::date_utc::DateUtc, 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/backend/core/src/models/budget_update.rs b/backend/core/src/models/budget_update.rs
deleted file mode 100644
index c7221b1..0000000
--- a/backend/core/src/models/budget_update.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use derive_builder::Builder;
-use diesel::prelude::*;
-use serde::Serialize;
-
-use crate::models::{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/backend/core/src/models/category.rs b/backend/core/src/models/category.rs
deleted file mode 100644
index 55c7b97..0000000
--- a/backend/core/src/models/category.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use derive_builder::Builder;
-use diesel::prelude::*;
-use serde::{Deserialize, Serialize};
-
-#[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,
-}
diff --git a/backend/core/src/models/category_balance.rs b/backend/core/src/models/category_balance.rs
deleted file mode 100644
index 796b40b..0000000
--- a/backend/core/src/models/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/backend/core/src/models/category_budget.rs b/backend/core/src/models/category_budget.rs
deleted file mode 100644
index 9796261..0000000
--- a/backend/core/src/models/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/backend/core/src/models/category_transfer.rs b/backend/core/src/models/category_transfer.rs
deleted file mode 100644
index 7b36054..0000000
--- a/backend/core/src/models/category_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::category_transfers)]
-pub struct CategoryTransfer {
- pub id: i32,
- pub description: String,
- pub quantity: i32,
- pub from_category_id: i32,
- pub to_category_id: i32,
-}
diff --git a/backend/core/src/models/date_utc.rs b/backend/core/src/models/date_utc.rs
deleted file mode 100644
index 55d9e3f..0000000
--- a/backend/core/src/models/date_utc.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-use std::{borrow::Borrow, fmt, str::FromStr};
-
-use anyhow::{Context, Error, Result};
-use chrono::{DateTime, Datelike, NaiveDate, NaiveTime, Utc};
-use diesel::{
- backend::Backend,
- deserialize::{self, FromSql, FromSqlRow},
- expression::AsExpression,
- serialize::{self, ToSql},
- sql_types::Text,
- sqlite::Sqlite,
-};
-use serde::{Deserialize, Serialize};
-
-use crate::traits::{dateable::Dateable, nowlike::Nowlike};
-
-use super::datetime_utc::DatetimeUtc;
-
-#[derive(
- Eq,
- PartialEq,
- Ord,
- PartialOrd,
- Serialize,
- Deserialize,
- Clone,
- Debug,
- AsExpression,
- FromSqlRow,
-)]
-#[diesel(sql_type=Text)]
-pub struct DateUtc {
- chrono_datetime_utc: DateTime<Utc>,
-}
-
-impl DateUtc {
- pub fn from_ymd(year: i32, month: u32, day: u32) -> Result<Self> {
- Ok(Self {
- chrono_datetime_utc: NaiveDate::from_ymd_opt(year, month, day)
- .with_context(|| format!("failed to construct date from ymd {:04}-{:02}-{:02}", year, month, day))?
- .and_hms_opt(0, 0, 0).unwrap()
- .and_utc()
- })
- }
-
- pub fn with_hms(&mut self, hour: u32, min: u32, sec: u32) -> Result<DatetimeUtc> {
- DatetimeUtc::from_ymd_and_hms(
- self.year(), self.month(), self.day(), hour, min, sec,
- )
- }
-
- pub fn day_diff(&self, other: &DateUtc) -> u32 {
- self.chrono_datetime_utc
- .num_days_from_ce()
- .abs_diff(other.chrono_datetime_utc.num_days_from_ce())
- }
-
- 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;
- }
-}
-
-impl Nowlike for DateUtc {
- fn now() -> Self {
- let now = Utc::now();
- Self::from_ymd(
- now.year(),
- now.month(),
- now.day(),
- ).unwrap()
- }
-}
-
-impl Dateable for DateUtc {
- fn year(&self) -> i32 {
- self.chrono_datetime_utc.year()
- }
-
- fn month(&self) -> u32 {
- self.chrono_datetime_utc.month()
- }
-
- fn day(&self) -> u32 {
- self.chrono_datetime_utc.day()
- }
-}
-
-impl From<DatetimeUtc> for DateUtc {
- fn from(datetime_utc: DatetimeUtc) -> Self {
- Self {
- chrono_datetime_utc: datetime_utc
- .borrow()
- .to_string()
- .parse::<DateTime<Utc>>().unwrap()
- .with_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap()).unwrap(),
- }
- }
-}
-
-impl<T> From<T> for DateUtc where T: Borrow<DateTime<Utc>> {
- fn from(chrono_datetime_utc: T) -> Self {
- Self {
- chrono_datetime_utc: chrono_datetime_utc
- .borrow()
- .with_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap()).unwrap(),
- }
- }
-}
-
-impl fmt::Display for DateUtc {
- /// Converts to a day string, YYYY-MM-DD, in UTC
- /// Example: 10.30am 24 Oct 2024 UTC -> "2024-10-24"
- fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
- let date_str = self.chrono_datetime_utc.to_rfc3339();
- let day_str = date_str
- .split_at_checked(10)
- .unwrap()
- .0;
- write!(f, "{}", day_str)
- }
-}
-
-impl FromStr for DateUtc {
- type Err = anyhow::Error;
-
- /// Constructs DatetimeUtc from a day string, YYYY-MM-DD, in UTC
- /// Example: "2024-10-24" -> Midnight 24 Oct 2024 UTC
- fn from_str(date_str: &str) -> Result<Self> {
- if !Self::is_day_str(&date_str) {
- Err(Error::msg(format!("{} is not a day string in YYYY-MM-DD format", date_str)))
- } else {
- let mut datetime_str = String::from(date_str);
- datetime_str.push_str("T00:00:00.000Z");
- Ok(Self {
- chrono_datetime_utc: datetime_str.parse()?,
- })
- }
- }
-}
-
-impl ToSql<Text, Sqlite> for DateUtc {
- 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 DateUtc {
- fn from_sql(bytes: <Sqlite as Backend>::RawValue<'_>) -> deserialize::Result<DateUtc> {
- let str = <String as FromSql<Text, Sqlite>>::from_sql(bytes)?;
- Ok(str.parse()?)
- }
-}
-
-#[cfg(test)]
-mod test {
- use crate::traits::timeable::Timeable;
-
- use super::*;
-
- #[test]
- fn when_from_ymd_then_ymd_are_as_expected() {
- let date_utc = DateUtc::from_ymd(1970, 11, 23);
-
- assert!(date_utc.is_ok());
- let date_utc = date_utc.unwrap();
- assert_eq!(date_utc.year(), 1970);
- assert_eq!(date_utc.month(), 11);
- assert_eq!(date_utc.day(), 23);
- }
-
- #[test]
- fn when_from_ymd_then_to_string_as_expected() {
- let date_utc = DateUtc::from_ymd(1970, 11, 23);
-
- assert!(date_utc.is_ok());
- assert_eq!(date_utc.unwrap().to_string(), "1970-11-23");
- }
-
- #[test]
- fn when_from_invalid_ymd_then_err() {
- let date_utc_1 = DateUtc::from_ymd(1970, 0, 23);
- let date_utc_2 = DateUtc::from_ymd(1970, 13, 23);
- let date_utc_3 = DateUtc::from_ymd(1970, 11, 0);
- let date_utc_4 = DateUtc::from_ymd(1970, 11, 31);
- let date_utc_5 = DateUtc::from_ymd(1971, 2, 29);
-
- assert!(date_utc_1.is_err());
- assert_eq!(date_utc_1.unwrap_err().to_string(), "failed to construct date from ymd 1970-00-23");
- assert!(date_utc_2.is_err());
- assert_eq!(date_utc_2.unwrap_err().to_string(), "failed to construct date from ymd 1970-13-23");
- assert!(date_utc_3.is_err());
- assert_eq!(date_utc_3.unwrap_err().to_string(), "failed to construct date from ymd 1970-11-00");
- assert!(date_utc_4.is_err());
- assert_eq!(date_utc_4.unwrap_err().to_string(), "failed to construct date from ymd 1970-11-31");
- assert!(date_utc_5.is_err());
- assert_eq!(date_utc_5.unwrap_err().to_string(), "failed to construct date from ymd 1971-02-29");
- }
-
- #[test]
- fn when_from_string_then_ymd_are_as_expected() {
- let date_utc: Result<DateUtc> = "1970-11-23".parse();
-
- assert!(date_utc.is_ok());
- let date_utc = date_utc.unwrap();
- assert_eq!(date_utc.year(), 1970);
- assert_eq!(date_utc.month(), 11);
- assert_eq!(date_utc.day(), 23);
- }
-
- #[test]
- fn when_from_string_then_to_string_as_expected() {
- let date_utc: Result<DateUtc> = "1970-11-23".parse();
-
- assert!(date_utc.is_ok());
- assert_eq!(date_utc.unwrap().to_string(), "1970-11-23");
- }
-
- #[test]
- fn when_from_invalid_string_then_err() {
- let date_utc_1: Result<DateUtc> = "1970-00-23".parse();
- let date_utc_2: Result<DateUtc> = "1970-13-23".parse();
- let date_utc_3: Result<DateUtc> = "1970-11-0".parse();
- let date_utc_4: Result<DateUtc> = "1970-11-31".parse();
- let date_utc_5: Result<DateUtc> = "1971-02-29".parse();
-
- assert!(date_utc_1.is_err());
- assert!(date_utc_2.is_err());
- assert!(date_utc_3.is_err());
- assert!(date_utc_4.is_err());
- assert!(date_utc_5.is_err());
- }
-
- #[test]
- fn with_with_hms_then_ymd_hms_are_as_expected() {
- let datetime_utc = DateUtc::from_ymd(1970, 11, 23).unwrap().with_hms(12, 55, 16);
-
- assert!(datetime_utc.is_ok());
- let datetime_utc = datetime_utc.unwrap();
- assert_eq!(datetime_utc.year(), 1970);
- assert_eq!(datetime_utc.month(), 11);
- assert_eq!(datetime_utc.day(), 23);
- assert_eq!(datetime_utc.hour(), 12);
- assert_eq!(datetime_utc.minute(), 55);
- assert_eq!(datetime_utc.second(), 16);
- }
-
- #[test]
- fn when_with_invalid_hms_then_err() {
- let datetime_utc_1 = DateUtc::from_ymd(1970, 11, 23).unwrap().with_hms(25, 0, 0);
- let datetime_utc_2 = DateUtc::from_ymd(1970, 11, 23).unwrap().with_hms(0, 61, 0);
- let datetime_utc_3 = DateUtc::from_ymd(1970, 11, 23).unwrap().with_hms(0, 0, 61);
-
- assert!(datetime_utc_1.is_err());
- assert!(datetime_utc_2.is_err());
- assert!(datetime_utc_3.is_err());
- }
-
- #[test]
- fn when_from_datetime_utc_at_different_times_on_same_day_then_eq() {
- let datetime_utc1 = DateUtc::from_ymd(1970, 11, 23).unwrap().with_hms(0, 0, 0).unwrap();
- let datetime_utc2 = DateUtc::from_ymd(1970, 11, 23).unwrap().with_hms(23, 59, 59).unwrap();
- let date_utc1 = DateUtc::from(datetime_utc1);
- let date_utc2 = DateUtc::from(datetime_utc2);
-
- assert_eq!(date_utc1, date_utc2);
- }
-
- #[test]
- fn given_today_when_day_diff_today_then_return_0() {
- let start = DateUtc::from_ymd(2000, 1, 1).unwrap();
- let end = DateUtc::from_ymd(2000, 1, 1).unwrap();
-
- let day_diff = start.day_diff(&end);
- let neg_day_diff = end.day_diff(&start);
-
- assert_eq!(day_diff, 0);
- assert_eq!(day_diff, neg_day_diff);
- }
-
- #[test]
- fn given_today_when_day_diff_tomorrow_then_return_1() {
- let start = DateUtc::from_ymd(2000, 1, 1).unwrap();
- let end = DateUtc::from_ymd(2000, 1, 2).unwrap();
-
- let day_diff = start.day_diff(&end);
- let neg_day_diff = end.day_diff(&start);
-
- assert_eq!(day_diff, 1);
- assert_eq!(day_diff, neg_day_diff);
- }
-}
diff --git a/backend/core/src/models/datetime_utc.rs b/backend/core/src/models/datetime_utc.rs
deleted file mode 100644
index 98d1d6c..0000000
--- a/backend/core/src/models/datetime_utc.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-use std::{fmt::Display, str::FromStr};
-
-use anyhow::{Context, Result};
-use chrono::{DateTime, Datelike as ChronoDatelike, NaiveDate, Timelike as ChronoTimelike, Utc};
-use diesel::{
- backend::Backend,
- deserialize::{self, FromSql, FromSqlRow},
- expression::AsExpression,
- serialize::{self, ToSql},
- sql_types::Text,
- sqlite::Sqlite,
-};
-use serde::{Deserialize, Serialize};
-
-use crate::traits::{dateable::Dateable, nowlike::Nowlike, timeable::Timeable};
-
-#[derive(
- PartialEq,
- Eq,
- PartialOrd,
- Ord,
- Serialize,
- Deserialize,
- Clone,
- Debug,
- AsExpression,
- FromSqlRow,
-)]
-#[diesel(sql_type=Text)]
-pub struct DatetimeUtc {
- chrono_datetime_utc: DateTime<Utc>,
-}
-
-impl DatetimeUtc {
- pub fn from_ymd_and_hms(year: i32, month: u32, day: u32, hour: u32, min: u32, sec: u32) -> Result<Self> {
- Ok(Self { chrono_datetime_utc: NaiveDate
- ::from_ymd_opt(year, month, day)
- .with_context(|| format!("failed to construct datetime from ymd {:04}-{:02}-{:02}", year, month, day))?
- .and_hms_opt(hour, min, sec)
- .with_context(|| format!("failed to construct datetime from hms {:02}:{:02}:{:02}", hour, min, sec))?
- .and_utc()
- })
- }
-}
-
-impl FromStr for DatetimeUtc {
- type Err = anyhow::Error;
-
- /// Constructs DatetimeUtc from a date string in ISO format, in UTC
- /// Example: "2024-10-24T10:30:00.000" -> 10.30am 24 Oct 2024 UTC
- fn from_str(datetime_str: &str) -> Result<Self> {
- let chrono_datetime_utc = datetime_str.parse::<DateTime<Utc>>()?;
- Ok(Self {
- chrono_datetime_utc,
- })
- }
-}
-
-impl Display for DatetimeUtc {
- /// Converts to a date string in ISO format, in UTC
- /// Example: 10.30am 24 Oct 2024 UTC -> "2024-10-24T10:30:00.000Z"
- fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
- write!(f, "{}", self.chrono_datetime_utc.to_rfc3339_opts(chrono::SecondsFormat::Millis, true))
- }
-}
-
-impl Nowlike for DatetimeUtc {
- fn now() -> Self {
- let now = Utc::now();
- Self::from_ymd_and_hms(
- now.year(),
- now.month(),
- now.day(),
- now.hour(),
- now.minute(),
- now.second(),
- ).unwrap()
- }
-}
-
-impl Dateable for DatetimeUtc {
- fn year(&self) -> i32 {
- self.chrono_datetime_utc.year()
- }
-
- fn month(&self) -> u32 {
- self.chrono_datetime_utc.month()
- }
-
- fn day(&self) -> u32 {
- self.chrono_datetime_utc.day()
- }
-}
-
-impl Timeable for DatetimeUtc {
- fn hour(&self) -> u32 {
- self.chrono_datetime_utc.hour()
- }
-
- fn minute(&self) -> u32 {
- self.chrono_datetime_utc.minute()
- }
-
- fn second(&self) -> u32 {
- self.chrono_datetime_utc.second()
- }
-}
-
-impl ToSql<Text, Sqlite> for DatetimeUtc {
- fn to_sql<'b>(
- &'b self,
- out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
- ) -> serialize::Result {
- out.set_value::<String>(self.to_string());
- Ok(serialize::IsNull::No)
- }
-}
-
-impl FromSql<Text, Sqlite> for DatetimeUtc {
- fn from_sql(bytes: <Sqlite as Backend>::RawValue<'_>) -> deserialize::Result<DatetimeUtc> {
- let str = <String as FromSql<Text, Sqlite>>::from_sql(bytes)?;
- Ok(str.parse()?)
- }
-}
-
-#[cfg(test)]
-mod test {
- use super::*;
-
- #[test]
- fn when_from_ymd_and_hms_then_ymd_and_hms_are_as_expected() {
- let datetime_utc = DatetimeUtc::from_ymd_and_hms(1970, 11, 23, 12, 55, 16);
-
- assert!(datetime_utc.is_ok());
- let date_utc = datetime_utc.unwrap();
- assert_eq!(date_utc.year(), 1970);
- assert_eq!(date_utc.month(), 11);
- assert_eq!(date_utc.day(), 23);
- assert_eq!(date_utc.hour(), 12);
- assert_eq!(date_utc.minute(), 55);
- assert_eq!(date_utc.second(), 16);
- }
-
- #[test]
- fn when_from_ymd_and_hms_then_to_string_as_expected() {
- let date_utc = DatetimeUtc::from_ymd_and_hms(1970, 11, 23, 12, 55, 16);
-
- assert!(date_utc.is_ok());
- assert_eq!(date_utc.unwrap().to_string(), "1970-11-23T12:55:16.000Z")
- }
-
- #[test]
- fn when_with_invalid_ymd_and_hms_then_err() {
- let datetime_utc_1 = DatetimeUtc::from_ymd_and_hms(1970, 0, 23, 12, 55, 16);
- let datetime_utc_2 = DatetimeUtc::from_ymd_and_hms(1970, 13, 23, 12, 55, 16);
- let datetime_utc_3 = DatetimeUtc::from_ymd_and_hms(1970, 11, 0, 12, 55, 16);
- let datetime_utc_4 = DatetimeUtc::from_ymd_and_hms(1970, 11, 31, 12, 55, 16);
- let datetime_utc_5 = DatetimeUtc::from_ymd_and_hms(1971, 2, 29, 12, 55, 16);
- let datetime_utc_6 = DatetimeUtc::from_ymd_and_hms(1970, 11, 23, 25, 0, 0);
- let datetime_utc_7 = DatetimeUtc::from_ymd_and_hms(1970, 11, 23, 0, 61, 0);
- let datetime_utc_8 = DatetimeUtc::from_ymd_and_hms(1970, 11, 23, 0, 0, 61);
-
- assert!(datetime_utc_1.is_err());
- assert_eq!(datetime_utc_1.unwrap_err().to_string(), "failed to construct datetime from ymd 1970-00-23");
- assert!(datetime_utc_2.is_err());
- assert_eq!(datetime_utc_2.unwrap_err().to_string(), "failed to construct datetime from ymd 1970-13-23");
- assert!(datetime_utc_3.is_err());
- assert_eq!(datetime_utc_3.unwrap_err().to_string(), "failed to construct datetime from ymd 1970-11-00");
- assert!(datetime_utc_4.is_err());
- assert_eq!(datetime_utc_4.unwrap_err().to_string(), "failed to construct datetime from ymd 1970-11-31");
- assert!(datetime_utc_5.is_err());
- assert_eq!(datetime_utc_5.unwrap_err().to_string(), "failed to construct datetime from ymd 1971-02-29");
- assert!(datetime_utc_6.is_err());
- assert_eq!(datetime_utc_6.unwrap_err().to_string(), "failed to construct datetime from hms 25:00:00");
- assert!(datetime_utc_7.is_err());
- assert_eq!(datetime_utc_7.unwrap_err().to_string(), "failed to construct datetime from hms 00:61:00");
- assert!(datetime_utc_8.is_err());
- assert_eq!(datetime_utc_8.unwrap_err().to_string(), "failed to construct datetime from hms 00:00:61");
- }
-
- #[test]
- fn when_from_string_then_ymd_and_hms_are_as_expected() {
- let date_utc: Result<DatetimeUtc> = "1970-11-23T12:55:16.000Z".parse();
-
- assert!(date_utc.is_ok());
- let datetime_utc = date_utc.unwrap();
- assert_eq!(datetime_utc.year(), 1970);
- assert_eq!(datetime_utc.month(), 11);
- assert_eq!(datetime_utc.day(), 23);
- assert_eq!(datetime_utc.hour(), 12);
- assert_eq!(datetime_utc.minute(), 55);
- assert_eq!(datetime_utc.second(), 16);
- }
-
- #[test]
- fn when_from_string_then_to_string_as_expected() {
- let datetime_utc: Result<DatetimeUtc> = "1970-11-23T12:55:16.000Z".parse();
-
- assert!(datetime_utc.is_ok());
- assert_eq!(datetime_utc.unwrap().to_string(), "1970-11-23T12:55:16.000Z")
- }
-
- #[test]
- fn when_from_invalid_string_then_err() {
- let datetime_utc_1: Result<DatetimeUtc> = "1970-00-23T00:00:00.000Z".parse();
- let datetime_utc_2: Result<DatetimeUtc> = "1970-13-23T00:00:00.000Z".parse();
- let datetime_utc_3: Result<DatetimeUtc> = "1970-11-0T00:00:00.000Z".parse();
- let datetime_utc_4: Result<DatetimeUtc> = "1970-11-31T00:00:00.000Z".parse();
- let datetime_utc_5: Result<DatetimeUtc> = "1971-02-29T00:00:00.000Z".parse();
- let datetime_utc_6: Result<DatetimeUtc> = "1970-11-23T25:00:00.000Z".parse();
- let datetime_utc_7: Result<DatetimeUtc> = "1970-11-23T00:61:00.000Z".parse();
- let datetime_utc_8: Result<DatetimeUtc> = "1970-11-23T00:00:61.000Z".parse();
-
- assert!(datetime_utc_1.is_err());
- assert!(datetime_utc_2.is_err());
- assert!(datetime_utc_3.is_err());
- assert!(datetime_utc_4.is_err());
- assert!(datetime_utc_5.is_err());
- assert!(datetime_utc_6.is_err());
- assert!(datetime_utc_7.is_err());
- assert!(datetime_utc_8.is_err());
- }
-}
diff --git a/backend/core/src/models/mod.rs b/backend/core/src/models/mod.rs
deleted file mode 100644
index 2eb7ac2..0000000
--- a/backend/core/src/models/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod account;
-pub mod budget;
-pub mod budget_update;
-pub mod category;
-pub mod category_balance;
-pub mod category_budget;
-pub mod category_transfer;
-pub mod date_utc;
-pub mod datetime_utc;
-pub mod transaction;
-pub mod transaction_categorisation;
diff --git a/backend/core/src/models/transaction.rs b/backend/core/src/models/transaction.rs
deleted file mode 100644
index 18a4c0e..0000000
--- a/backend/core/src/models/transaction.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use derive_builder::Builder;
-use diesel::prelude::*;
-
-use crate::models::account::Account;
-
-use super::datetime_utc::DatetimeUtc;
-
-#[derive(Builder, Queryable, Identifiable, Selectable, Insertable, Associations, Debug, PartialEq)]
-#[diesel(table_name = crate::schema::transactions)]
-#[diesel(belongs_to(Account))]
-pub struct Transaction {
- pub id: i32,
- pub description: String,
- pub payee: String,
- pub quantity: i32,
- pub date: DatetimeUtc,
- pub account_id: i32,
-}
diff --git a/backend/core/src/models/transaction_categorisation.rs b/backend/core/src/models/transaction_categorisation.rs
deleted file mode 100644
index c6ac6ea..0000000
--- a/backend/core/src/models/transaction_categorisation.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use derive_builder::Builder;
-use diesel::prelude::*;
-
-#[derive(Builder, Queryable, Identifiable, Selectable, Insertable, Debug, PartialEq)]
-#[diesel(table_name = crate::schema::transaction_categorisations)]
-pub struct TransactionCategorisation {
- pub id: i32,
- pub description: String,
- pub quantity: i32,
- pub transaction_id: i32,
- pub category_id: i32,
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-08 18:43:16 +0000