Made scheduled transactions more generic.

This commit is contained in:
2026-09-24 21:07:38 +02:00
parent 18cf7e6bdd
commit 9e5a976ac7
17 changed files with 235 additions and 92 deletions
+31
View File
@@ -0,0 +1,31 @@
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum TransactionDirection {
In,
Out,
}
#[derive(Debug)]
pub struct TransactionDirectionConversionError(pub String);
impl std::fmt::Display for TransactionDirectionConversionError {
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(formatter, "invalid direction value: {}", self.0)
}
}
impl std::error::Error for TransactionDirectionConversionError {}
impl TryFrom<String> for TransactionDirection {
type Error = TransactionDirectionConversionError;
fn try_from(value: String) -> Result<Self, Self::Error> {
match value.as_str() {
"in" => Ok(Self::In),
"out" => Ok(Self::Out),
_ => Err(TransactionDirectionConversionError(value)),
}
}
}
@@ -2,20 +2,24 @@ use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use crate::database::dtos::expense::RecurringExpenseRow;
use crate::{
database::dtos::scheduled_transaction::RecurringTransactionRow,
routes::dtos::direction::{TransactionDirection, TransactionDirectionConversionError},
};
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
#[serde(tag = "type")]
pub enum Expense {
Recurring(RecurringExpense),
pub enum ScheduledTransaction {
Recurring(RecurringTransaction),
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RecurringExpense {
pub struct RecurringTransaction {
pub id: Uuid,
pub name: String,
pub amount: f64,
pub direction: TransactionDirection,
pub start: DateTime<Utc>,
pub end: Option<DateTime<Utc>>,
pub recurrence: Recurrence,
@@ -45,21 +49,23 @@ pub enum WeekendAdjustment {
}
#[derive(Debug)]
pub enum RecurringExpenseConversionError {
pub enum RecurringTransactionConversionError {
Direction(TransactionDirectionConversionError),
RecurrenceEvery(i32),
RecurrenceUnit(String),
WeekendAdjustment(String),
}
impl From<RecurringExpense> for Expense {
fn from(expense: RecurringExpense) -> Self {
Self::Recurring(expense)
impl From<RecurringTransaction> for ScheduledTransaction {
fn from(transaction: RecurringTransaction) -> Self {
Self::Recurring(transaction)
}
}
impl std::fmt::Display for RecurringExpenseConversionError {
impl std::fmt::Display for RecurringTransactionConversionError {
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::Direction(error) => error.fmt(formatter),
Self::RecurrenceEvery(value) => {
write!(formatter, "invalid recurrence_every value: {value}")
}
@@ -73,21 +79,23 @@ impl std::fmt::Display for RecurringExpenseConversionError {
}
}
impl std::error::Error for RecurringExpenseConversionError {}
impl std::error::Error for RecurringTransactionConversionError {}
impl TryFrom<RecurringExpenseRow> for RecurringExpense {
type Error = RecurringExpenseConversionError;
impl TryFrom<RecurringTransactionRow> for RecurringTransaction {
type Error = RecurringTransactionConversionError;
fn try_from(row: RecurringExpenseRow) -> Result<Self, Self::Error> {
fn try_from(row: RecurringTransactionRow) -> Result<Self, Self::Error> {
Ok(Self {
id: row.id,
name: row.name,
amount: row.amount_cents as f64 / 100.0,
direction: TransactionDirection::try_from(row.direction)
.map_err(RecurringTransactionConversionError::Direction)?,
start: row.starts_at,
end: row.ends_at,
recurrence: Recurrence {
every: row.recurrence_every.try_into().map_err(|_| {
RecurringExpenseConversionError::RecurrenceEvery(row.recurrence_every)
RecurringTransactionConversionError::RecurrenceEvery(row.recurrence_every)
})?,
unit: RecurrenceUnit::try_from(row.recurrence_unit)?,
weekend_adjustment: match row.weekend_adjustment {
@@ -100,7 +108,7 @@ impl TryFrom<RecurringExpenseRow> for RecurringExpense {
}
impl TryFrom<String> for RecurrenceUnit {
type Error = RecurringExpenseConversionError;
type Error = RecurringTransactionConversionError;
fn try_from(value: String) -> Result<Self, Self::Error> {
match value.as_str() {
@@ -108,19 +116,21 @@ impl TryFrom<String> for RecurrenceUnit {
"week" => Ok(Self::Week),
"month" => Ok(Self::Month),
"year" => Ok(Self::Year),
_ => Err(RecurringExpenseConversionError::RecurrenceUnit(value)),
_ => Err(RecurringTransactionConversionError::RecurrenceUnit(value)),
}
}
}
impl TryFrom<String> for WeekendAdjustment {
type Error = RecurringExpenseConversionError;
type Error = RecurringTransactionConversionError;
fn try_from(value: String) -> Result<Self, Self::Error> {
match value.as_str() {
"previous_business_day" => Ok(Self::PreviousBusinessDay),
"next_business_day" => Ok(Self::NextBusinessDay),
_ => Err(RecurringExpenseConversionError::WeekendAdjustment(value)),
_ => Err(RecurringTransactionConversionError::WeekendAdjustment(
value,
)),
}
}
}
+13 -5
View File
@@ -3,23 +3,28 @@ use serde::Serialize;
use uuid::Uuid;
use crate::database::dtos::transaction::TransactionRow;
use crate::routes::dtos::direction::{TransactionDirection, TransactionDirectionConversionError};
#[derive(Serialize)]
pub struct TransactionResponse {
pub id: Uuid,
pub description: String,
pub amount: f64,
pub direction: TransactionDirection,
pub date: DateTime<Utc>,
}
impl From<TransactionRow> for TransactionResponse {
fn from(row: TransactionRow) -> Self {
Self {
impl TryFrom<TransactionRow> for TransactionResponse {
type Error = TransactionDirectionConversionError;
fn try_from(row: TransactionRow) -> Result<Self, Self::Error> {
Ok(Self {
id: row.id,
description: row.description,
amount: row.amount_cents as f64 / 100.0,
direction: TransactionDirection::try_from(row.direction)?,
date: row.date,
}
})
}
}
@@ -31,13 +36,16 @@ mod tests {
fn converts_cents_to_major_currency_units() {
let id = Uuid::new_v4();
let date = Utc::now();
let response = TransactionResponse::from(TransactionRow {
let response = TransactionResponse::try_from(TransactionRow {
id,
description: "Groceries".to_string(),
amount_cents: 4250,
direction: "out".to_string(),
date,
});
let response = response.expect("valid direction");
assert_eq!(response.id, id);
assert_eq!(response.description, "Groceries");
assert_eq!(response.amount, 42.5);