refactor: nest seed_path configs under new 'accounting_init' parent

Author: vindard

core/credit/src/config.rs

@@ -1,5 +1,3 @@
-use std::path::PathBuf;
-
 use serde::{Deserialize, Serialize};
 
 use crate::primitives::CVLPct;
@@ -10,16 +8,13 @@ pub struct CreditConfig {
     pub upgrade_buffer_cvl_pct: CVLPct,
     #[serde(default = "default_customer_active_check_enabled")]
     pub customer_active_check_enabled: bool,
-    #[serde(default = "default_chart_of_accounts_config_path")]
-    pub chart_of_accounts_config_path: Option<PathBuf>,
 }
 
 impl Default for CreditConfig {
     fn default() -> Self {
         CreditConfig {
             upgrade_buffer_cvl_pct: default_upgrade_buffer_cvl_pct(),
             customer_active_check_enabled: default_customer_active_check_enabled(),
-            chart_of_accounts_config_path: default_chart_of_accounts_config_path(),
         }
     }
 }
@@ -31,7 +26,3 @@ fn default_upgrade_buffer_cvl_pct() -> CVLPct {
 fn default_customer_active_check_enabled() -> bool {
     true
 }
-
-fn default_chart_of_accounts_config_path() -> Option<PathBuf> {
-    None
-}

core/deposit/src/config.rs

@@ -3,7 +3,6 @@
 
 mod account;
 mod chart_of_accounts_integration;
-mod config;
 mod deposit;
 mod deposit_account_balance;
 pub mod error;
@@ -33,7 +32,6 @@ use account::*;
 pub use chart_of_accounts_integration::{
     ChartOfAccountsIntegrationConfig, ChartOfAccountsIntegrationConfigBuilderError,
 };
-pub use config::*;
 use deposit::*;
 pub use deposit::{Deposit, DepositsByCreatedAtCursor};
 pub use deposit_account_balance::DepositAccountBalance;

core/deposit/src/lib.rs

@@ -4,7 +4,7 @@ mod seed;
 pub mod error;
 
 use crate::{
-    accounting::ChartOfAccounts, app::ChartOfAccountsSeedPathsConfig, balance_sheet::BalanceSheets,
+    accounting::ChartOfAccounts, app::AccountingInitConfig, balance_sheet::BalanceSheets,
     credit::Credit, deposit::Deposits, primitives::CalaJournalId,
     profit_and_loss::ProfitAndLossStatements, trial_balance::TrialBalances,
 };
@@ -46,14 +46,14 @@ impl ChartsInit {
         trial_balances: &TrialBalances,
         credit: &Credit,
         deposit: &Deposits,
-        seed_paths_config: ChartOfAccountsSeedPathsConfig,
+        accounting_init_config: AccountingInitConfig,
     ) -> Result<(), AccountingInitError> {
         seed::charts_of_accounts::init(
             chart_of_accounts,
             trial_balances,
             credit,
             deposit,
-            seed_paths_config,
+            accounting_init_config,
         )
         .await
     }

lana/app/src/accounting_init/mod.rs

@@ -14,19 +14,19 @@ pub(crate) async fn init(
     trial_balances: &TrialBalances,
     credit: &Credit,
     deposit: &Deposits,
-    seed_paths_config: ChartOfAccountsSeedPathsConfig,
+    accounting_init_config: AccountingInitConfig,
 ) -> Result<(), AccountingInitError> {
     let chart_id = create_chart_of_accounts(chart_of_accounts).await?;
 
-    if let Some(path) = seed_paths_config.clone().chart_of_accounts_seed_path {
+    if let Some(path) = accounting_init_config.clone().chart_of_accounts_seed_path {
         seed_chart_of_accounts(
             chart_of_accounts,
             trial_balances,
             credit,
             deposit,
             chart_id,
             path,
-            seed_paths_config,
+            accounting_init_config,
         )
         .await?;
     }
@@ -57,14 +57,14 @@ async fn seed_chart_of_accounts(
     deposit: &Deposits,
     chart_id: ChartId,
     chart_of_accounts_seed_path: PathBuf,
-    seed_paths_config: ChartOfAccountsSeedPathsConfig,
+    accounting_init_config: AccountingInitConfig,
 ) -> Result<(), AccountingInitError> {
-    let ChartOfAccountsSeedPathsConfig {
+    let AccountingInitConfig {
         credit_config_path,
         deposit_config_path,
 
         chart_of_accounts_seed_path: _,
-    } = seed_paths_config;
+    } = accounting_init_config;
 
     let data = std::fs::read_to_string(chart_of_accounts_seed_path)?;
     if let Some(new_account_set_ids) = chart_of_accounts

lana/app/src/accounting_init/seed/charts_of_accounts.rs

@@ -4,9 +4,8 @@ use std::path::PathBuf;
 
 use crate::{
     applicant::SumsubConfig, credit::CreditConfig, customer_sync::CustomerSyncConfig,
-    deposit::DepositConfig, job::JobExecutorConfig, report::ReportConfig,
-    service_account::ServiceAccountConfig, storage::config::StorageConfig,
-    user_onboarding::UserOnboardingConfig,
+    job::JobExecutorConfig, report::ReportConfig, service_account::ServiceAccountConfig,
+    storage::config::StorageConfig, user_onboarding::UserOnboardingConfig,
 };
 
 #[derive(Clone, Default, Debug, Deserialize, Serialize)]
@@ -20,8 +19,6 @@ pub struct AppConfig {
     #[serde(default)]
     pub credit: CreditConfig,
     #[serde(default)]
-    pub deposit: DepositConfig,
-    #[serde(default)]
     pub service_account: ServiceAccountConfig,
     #[serde(default)]
     pub report: ReportConfig,
@@ -32,7 +29,7 @@ pub struct AppConfig {
     #[serde(default)]
     pub customer_sync: CustomerSyncConfig,
     #[serde(default)]
-    pub chart_of_accounts_seed_path: Option<PathBuf>,
+    pub accounting_init: AccountingInitConfig,
 }
 
 #[derive(Clone, Default, Debug, Deserialize, Serialize)]
@@ -42,21 +39,11 @@ pub struct UserConfig {
 }
 
 #[derive(Clone, Default, Debug, Deserialize, Serialize)]
-pub struct ChartOfAccountsSeedPathsConfig {
+pub struct AccountingInitConfig {
     #[serde(default)]
     pub chart_of_accounts_seed_path: Option<PathBuf>,
     #[serde(default)]
     pub deposit_config_path: Option<PathBuf>,
     #[serde(default)]
     pub credit_config_path: Option<PathBuf>,
 }
-
-impl From<AppConfig> for ChartOfAccountsSeedPathsConfig {
-    fn from(config: AppConfig) -> Self {
-        Self {
-            chart_of_accounts_seed_path: config.chart_of_accounts_seed_path,
-            credit_config_path: config.credit.chart_of_accounts_config_path,
-            deposit_config_path: config.deposit.chart_of_accounts_config_path,
-        }
-    }
-}

lana/app/src/app/config.rs

@@ -60,8 +60,6 @@ impl LanaApp {
     pub async fn run(pool: PgPool, config: AppConfig) -> Result<Self, ApplicationError> {
         sqlx::migrate!().run(&pool).await?;
 
-        let seed_config = ChartOfAccountsSeedPathsConfig::from(config.clone());
-
         let mut jobs = Jobs::new(&pool, config.job_execution);
         let audit = Audit::new(&pool);
         let authz = init_authz(&pool, &audit).await?;
@@ -133,7 +131,7 @@ impl LanaApp {
             accounting.trial_balances(),
             &credit,
             &deposits,
-            seed_config,
+            config.accounting_init,
         )
         .await?;
 

lana/app/src/app/mod.rs

@@ -80,9 +80,9 @@ pub mod audit {
 pub mod deposit {
     pub use deposit::{
         error, ChartOfAccountsIntegrationConfig, CoreDepositEvent, Deposit, DepositAccount,
-        DepositAccountBalance, DepositAccountHistoryCursor, DepositAccountHistoryEntry,
-        DepositConfig, DepositId, DepositsByCreatedAtCursor, Withdrawal, WithdrawalId,
-        WithdrawalStatus, WithdrawalsByCreatedAtCursor,
+        DepositAccountBalance, DepositAccountHistoryCursor, DepositAccountHistoryEntry, DepositId,
+        DepositsByCreatedAtCursor, Withdrawal, WithdrawalId, WithdrawalStatus,
+        WithdrawalsByCreatedAtCursor,
     };
 
     pub type Deposits =