Skip to content

Commit

Permalink
chore: remove transaction accounts from chart of accounts
Browse files Browse the repository at this point in the history
  • Loading branch information
@vindard
vindard committed Jan 16, 2025
1 parent c0fd5e6 commit 1db5841
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 329 deletions.
154 changes: 7 additions & 147 deletions core/chart-of-accounts/src/chart_of_accounts/entity.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use es_entity::*;

use crate::{
path::*,
primitives::{ChartAccountDetails, ChartCreationDetails, ChartId, LedgerAccountId},
primitives::{ChartAccountDetails, ChartCreationDetails, ChartId},
};

pub use super::error::*;
Expand Down Expand Up @@ -35,14 +35,6 @@ pub enum ChartEvent {
reference: String,
audit_info: AuditInfo,
},
TransactionAccountAdded {
id: LedgerAccountId,
encoded_path: String,
path: TransactionAccountPath,
name: String,
description: String,
audit_info: AuditInfo,
},
}

#[derive(EsEntity, Builder)]
Expand Down Expand Up @@ -167,46 +159,19 @@ impl Chart {
Ok(path)
}

fn next_transaction_account(
&self,
control_sub_account: ControlSubAccountPath,
) -> Result<TransactionAccountPath, ChartError> {
Ok(self
.events
.iter_all()
.rev()
.find_map(|event| match event {
ChartEvent::TransactionAccountAdded { path, .. }
if path.category == control_sub_account.category
&& path.control_account() == control_sub_account.control_account()
&& path.control_sub_account() == control_sub_account =>
{
Some(path.next())
}
_ => None,
})
.unwrap_or(Ok(control_sub_account.first_transaction_account()))?)
}

pub fn add_transaction_account(
&mut self,
creation_details: ChartCreationDetails,
audit_info: AuditInfo,
_audit_info: AuditInfo,
) -> Result<ChartAccountDetails, ChartError> {
let path = self.next_transaction_account(creation_details.control_sub_account)?;
self.events.push(ChartEvent::TransactionAccountAdded {
id: creation_details.account_id,
encoded_path: path.path_encode(self.id),
path,
name: creation_details.name.clone(),
description: creation_details.description.clone(),
audit_info,
});
// TODO: implement by potentially adding account to ControlSubAccount nested entity

Ok(ChartAccountDetails {
account_id: creation_details.account_id,
encoded_path: path.path_encode(self.id),
path,
encoded_path: format!(
"{}.{}",
creation_details.control_sub_account, creation_details.account_id
),
name: creation_details.name,
description: creation_details.description,
})
Expand All @@ -223,7 +188,6 @@ impl TryFromEvents<ChartEvent> for Chart {
}
ChartEvent::ControlAccountAdded { .. } => (),
ChartEvent::ControlSubAccountAdded { .. } => (),
ChartEvent::TransactionAccountAdded { .. } => (),
}
}
builder.events(events).build()
Expand Down Expand Up @@ -415,52 +379,6 @@ mod tests {
}
}

#[test]
fn test_create_transaction_account() {
let mut chart = init_chart_of_events();
let control_account = chart
.create_control_account(
ChartCategory::Assets,
"Assets".to_string(),
"assets".to_string(),
dummy_audit_info(),
)
.unwrap();
let control_sub_account = chart
.create_control_sub_account(
control_account,
"Current Assets".to_string(),
"current-assets".to_string(),
dummy_audit_info(),
)
.unwrap();

let ChartAccountDetails {
path:
TransactionAccountPath {
category,
control_index,
control_sub_index,
index,
},
..
} = chart
.add_transaction_account(
ChartCreationDetails {
account_id: LedgerAccountId::new(),
control_sub_account,
name: "Cash".to_string(),
description: "Cash account".to_string(),
},
dummy_audit_info(),
)
.unwrap();
assert_eq!(category, ChartCategory::Assets);
assert_eq!(control_index, AccountIdx::FIRST);
assert_eq!(control_sub_index, AccountIdx::FIRST);
assert_eq!(index, AccountIdx::FIRST);
}

#[test]
fn test_create_sequential_control_accounts() {
let mut chart = init_chart_of_events();
Expand Down Expand Up @@ -523,62 +441,4 @@ mod tests {
assert_eq!(control_index, AccountIdx::FIRST);
assert_eq!(index, AccountIdx::FIRST.next());
}

#[test]
fn test_create_sequential_transaction_accounts() {
let mut chart = init_chart_of_events();
let control_account = chart
.create_control_account(
ChartCategory::Assets,
"Assets".to_string(),
"assets".to_string(),
dummy_audit_info(),
)
.unwrap();
let control_sub_account = chart
.create_control_sub_account(
control_account,
"Current Assets".to_string(),
"current-assets".to_string(),
dummy_audit_info(),
)
.unwrap();

chart
.add_transaction_account(
ChartCreationDetails {
account_id: LedgerAccountId::new(),
control_sub_account,
name: "First".to_string(),
description: "First transaction account".to_string(),
},
dummy_audit_info(),
)
.unwrap();

let ChartAccountDetails {
path:
TransactionAccountPath {
category,
control_index,
control_sub_index,
index,
},
..
} = chart
.add_transaction_account(
ChartCreationDetails {
account_id: LedgerAccountId::new(),
control_sub_account,
name: "Second".to_string(),
description: "Second transaction account".to_string(),
},
dummy_audit_info(),
)
.unwrap();
assert_eq!(category, ChartCategory::Assets);
assert_eq!(control_index, AccountIdx::FIRST);
assert_eq!(control_sub_index, AccountIdx::FIRST);
assert_eq!(index, AccountIdx::FIRST.next());
}
}
2 changes: 0 additions & 2 deletions core/chart-of-accounts/src/path/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ pub enum ChartPathError {
InvalidCategoryForNewControlAccount,
#[error("ChartError - InvalidControlAccountPathForNewControlSubAccount")]
InvalidControlAccountPathForNewControlSubAccount,
#[error("ChartError - InvalidSubControlAccountPathForNewTransactionAccount")]
InvalidSubControlAccountPathForNewTransactionAccount,
#[error("ChartError - ControlIndexOverflowForCategory: Category '{0}'")]
ControlIndexOverflowForCategory(ChartCategory),
#[error(
Expand Down
Loading

0 comments on commit 1db5841

Please sign in to comment.