Create/update scheduled transactions.

This commit is contained in:
2026-09-24 22:40:32 +02:00
parent ffe516d197
commit 17f11deae0
11 changed files with 584 additions and 87 deletions
+134 -55
View File
@@ -4,9 +4,7 @@ use uuid::Uuid;
use crate::{
database::dtos::scheduled_transaction::RecurringTransactionRow,
routes::dtos::transaction_direction::{
TransactionDirection, TransactionDirectionConversionError,
},
routes::dtos::direction::{Direction, DirectionConversionError},
};
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -16,12 +14,60 @@ pub enum ScheduledTransaction {
Recurring(RecurringTransaction),
}
impl From<RecurringTransaction> for ScheduledTransaction {
fn from(transaction: RecurringTransaction) -> Self {
Self::Recurring(transaction)
}
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RecurringTransaction {
pub id: Uuid,
#[serde(flatten)]
pub data: RecurringTransactionData,
}
impl TryFrom<RecurringTransactionRow> for RecurringTransaction {
type Error = RecurringTransactionConversionError;
fn try_from(row: RecurringTransactionRow) -> Result<Self, Self::Error> {
Ok(Self {
id: row.id,
data: RecurringTransactionData {
name: row.name,
amount: row.amount_cents as f64 / 100.0,
direction: Direction::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(|_| {
RecurringTransactionConversionError::RecurrenceEvery(row.recurrence_every)
})?,
unit: RecurrenceUnit::try_from(row.recurrence_unit)?,
weekend_adjustment: match row.weekend_adjustment {
Some(value) => Some(WeekendAdjustment::try_from(value)?),
None => None,
},
},
},
})
}
}
#[derive(Debug, Clone, Deserialize)]
#[serde(rename_all = "snake_case")]
#[serde(tag = "type")]
pub enum ScheduledTransactionData {
Recurring(RecurringTransactionData),
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RecurringTransactionData {
pub name: String,
pub amount: f64,
pub direction: TransactionDirection,
pub direction: Direction,
pub start: DateTime<Utc>,
pub end: Option<DateTime<Utc>>,
pub recurrence: Recurrence,
@@ -43,6 +89,31 @@ pub enum RecurrenceUnit {
Year,
}
impl RecurrenceUnit {
pub fn as_str(&self) -> &'static str {
match self {
Self::Day => "day",
Self::Week => "week",
Self::Month => "month",
Self::Year => "year",
}
}
}
impl TryFrom<String> for RecurrenceUnit {
type Error = RecurringTransactionConversionError;
fn try_from(value: String) -> Result<Self, Self::Error> {
match value.as_str() {
"day" => Ok(Self::Day),
"week" => Ok(Self::Week),
"month" => Ok(Self::Month),
"year" => Ok(Self::Year),
_ => Err(RecurringTransactionConversionError::RecurrenceUnit(value)),
}
}
}
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum WeekendAdjustment {
@@ -50,19 +121,38 @@ pub enum WeekendAdjustment {
NextBusinessDay,
}
impl WeekendAdjustment {
pub fn as_str(&self) -> &'static str {
match self {
Self::PreviousBusinessDay => "previous_business_day",
Self::NextBusinessDay => "next_business_day",
}
}
}
impl TryFrom<String> for WeekendAdjustment {
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(RecurringTransactionConversionError::WeekendAdjustment(
value,
)),
}
}
}
#[derive(Debug)]
pub enum RecurringTransactionConversionError {
Direction(TransactionDirectionConversionError),
Direction(DirectionConversionError),
RecurrenceEvery(i32),
RecurrenceUnit(String),
WeekendAdjustment(String),
}
impl From<RecurringTransaction> for ScheduledTransaction {
fn from(transaction: RecurringTransaction) -> Self {
Self::Recurring(transaction)
}
}
impl std::error::Error for RecurringTransactionConversionError {}
impl std::fmt::Display for RecurringTransactionConversionError {
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -81,58 +171,47 @@ impl std::fmt::Display for RecurringTransactionConversionError {
}
}
impl std::error::Error for RecurringTransactionConversionError {}
#[cfg(test)]
mod tests {
use chrono::{TimeZone, Utc};
use uuid::Uuid;
impl TryFrom<RecurringTransactionRow> for RecurringTransaction {
type Error = RecurringTransactionConversionError;
use super::{
Recurrence, RecurrenceUnit, RecurringTransaction, RecurringTransactionData,
ScheduledTransaction, ScheduledTransactionData, WeekendAdjustment,
};
use crate::routes::dtos::direction::Direction;
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,
fn transaction(amount: f64) -> RecurringTransactionData {
RecurringTransactionData {
name: String::new(),
amount,
direction: Direction::Out,
start: Utc.with_ymd_and_hms(2026, 9, 24, 12, 0, 0).unwrap(),
end: None,
recurrence: Recurrence {
every: row.recurrence_every.try_into().map_err(|_| {
RecurringTransactionConversionError::RecurrenceEvery(row.recurrence_every)
})?,
unit: RecurrenceUnit::try_from(row.recurrence_unit)?,
weekend_adjustment: match row.weekend_adjustment {
Some(value) => Some(WeekendAdjustment::try_from(value)?),
None => None,
},
every: 2,
unit: RecurrenceUnit::Month,
weekend_adjustment: Some(WeekendAdjustment::NextBusinessDay),
},
})
}
}
impl TryFrom<String> for RecurrenceUnit {
type Error = RecurringTransactionConversionError;
fn try_from(value: String) -> Result<Self, Self::Error> {
match value.as_str() {
"day" => Ok(Self::Day),
"week" => Ok(Self::Week),
"month" => Ok(Self::Month),
"year" => Ok(Self::Year),
_ => Err(RecurringTransactionConversionError::RecurrenceUnit(value)),
}
}
}
impl TryFrom<String> for WeekendAdjustment {
type Error = RecurringTransactionConversionError;
#[test]
fn keeps_scheduled_transaction_json_flat() {
let response = ScheduledTransaction::Recurring(RecurringTransaction {
id: Uuid::nil(),
data: transaction(12.34),
});
let response = serde_json::to_value(response).unwrap();
assert_eq!(response["type"], "recurring");
assert_eq!(response["id"], Uuid::nil().to_string());
assert_eq!(response["amount"], 12.34);
assert!(response.get("data").is_none());
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(RecurringTransactionConversionError::WeekendAdjustment(
value,
)),
}
let request: ScheduledTransactionData = serde_json::from_value(response).unwrap();
let ScheduledTransactionData::Recurring(data) = request;
assert_eq!(data.amount, 12.34);
assert_eq!(data.recurrence.every, 2);
}
}