Added additional transaction operations.
This commit is contained in:
@@ -4,7 +4,10 @@ use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
database::dtos::recurring_transaction::RecurringTransactionRow,
|
||||
routes::dtos::direction::{Direction, DirectionConversionError},
|
||||
routes::dtos::{
|
||||
amount_cents::{AmountCents, AmountCentsConversionError},
|
||||
direction::{Direction, DirectionConversionError},
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
@@ -36,9 +39,7 @@ impl TryFrom<RecurringTransactionRow> for RecurringTransaction {
|
||||
id: row.id,
|
||||
data: RecurringTransactionData {
|
||||
name: row.name,
|
||||
amount_cents: row.amount_cents.try_into().map_err(|_| {
|
||||
RecurringTransactionConversionError::AmountCents(row.amount_cents)
|
||||
})?,
|
||||
amount_cents: AmountCents::try_from(row.amount_cents)?,
|
||||
direction: Direction::try_from(row.direction)
|
||||
.map_err(RecurringTransactionConversionError::Direction)?,
|
||||
start: row.starts_at,
|
||||
@@ -68,7 +69,7 @@ pub enum ScheduledTransactionData {
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct RecurringTransactionData {
|
||||
pub name: String,
|
||||
pub amount_cents: u64,
|
||||
pub amount_cents: AmountCents,
|
||||
pub direction: Direction,
|
||||
pub start: DateTime<Utc>,
|
||||
pub end: Option<DateTime<Utc>>,
|
||||
@@ -148,8 +149,8 @@ impl TryFrom<String> for WeekendAdjustment {
|
||||
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum RecurringTransactionConversionError {
|
||||
#[error("invalid amount_cents value: {0}")]
|
||||
AmountCents(i64),
|
||||
#[error(transparent)]
|
||||
AmountCents(#[from] AmountCentsConversionError),
|
||||
|
||||
#[error(transparent)]
|
||||
Direction(#[from] DirectionConversionError),
|
||||
@@ -178,7 +179,7 @@ mod tests {
|
||||
fn transaction(amount_cents: u64) -> RecurringTransactionData {
|
||||
RecurringTransactionData {
|
||||
name: String::new(),
|
||||
amount_cents,
|
||||
amount_cents: amount_cents.into(),
|
||||
direction: Direction::Out,
|
||||
start: Utc.with_ymd_and_hms(2026, 9, 24, 12, 0, 0).unwrap(),
|
||||
end: None,
|
||||
@@ -204,7 +205,7 @@ mod tests {
|
||||
|
||||
let request: ScheduledTransactionData = serde_json::from_value(response).unwrap();
|
||||
let ScheduledTransactionData::Recurring(data) = request;
|
||||
assert_eq!(data.amount_cents, 1234);
|
||||
assert_eq!(data.amount_cents.get(), 1234);
|
||||
assert_eq!(data.recurrence.every, 2);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user