refactor models and traits with pub use

17 files changed, 33 insertions, 36 deletions

diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/schist_state.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/schist_state.rs
index d5f7e6f..ca5a15c 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/schist_state.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/schist_state.rs
@@ -1,9 +1,7 @@
 use anyhow::Result;
 use diesel::SqliteConnection;
 use schist_models::{
-    account::Account, account_transfer::AccountTransfer, bucket::Bucket,
-    bucket_transfer::BucketTransfer, date_utc::DateUtc, drip::Drip, pipe::Pipe,
-    transaction::Transaction,
+    Account, AccountTransfer, Bucket, BucketTransfer, DateUtc, Drip, Pipe, Transaction,
 };
 
 pub struct SchistState {
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_account_transfers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_account_transfers.rs
index 3a9d4b2..c41b812 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_account_transfers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_account_transfers.rs
@@ -1,7 +1,7 @@
 use actualbudget_models::ActualbudgetTransaction;
 use anyhow::{Context, Result};
 use itertools::Itertools;
-use schist_models::account_transfer::AccountTransfer;
+use schist_models::AccountTransfer;
 
 use super::{
     is_account_transfer, is_not_account_transfer, transform_date::transform_date,
@@ -112,7 +112,7 @@ fn transform_account_transfer(
 mod test {
     use actualbudget_fakes::actualbudget_transaction::make_fake_actualbudget_transaction_builder;
     use actualbudget_models::ActualbudgetDate;
-    use schist_models::date_utc::DateUtc;
+    use schist_models::DateUtc;
 
     use crate::transform_state::transform_id::transform_id;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs
index 28d8162..c900da7 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_accounts.rs
@@ -1,5 +1,5 @@
 use actualbudget_models::ActualbudgetAccount;
-use schist_models::{account::Account, date_utc::DateUtc};
+use schist_models::{Account, DateUtc};
 
 use super::transform_id;
 
@@ -10,10 +10,12 @@ pub fn transform_accounts(
 ) -> Vec<Account> {
     actualbudget_accounts
         .iter()
-        .filter(|a| actualbudget_category_transfers_account
-            .clone()
-            .is_some_and(|cta| cta.id != a.id)
-        ).map(|a| transform_account(a, first_activity_date))
+        .filter(|a| {
+            actualbudget_category_transfers_account
+                .clone()
+                .is_some_and(|cta| cta.id != a.id)
+        })
+        .map(|a| transform_account(a, first_activity_date))
         .collect()
 }
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_budget_drips.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_budget_drips.rs
index 6fd7610..76509cd 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_budget_drips.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_budget_drips.rs
@@ -3,8 +3,8 @@ use std::hash::{DefaultHasher, Hash, Hasher};
 use actualbudget_models::ActualbudgetZeroBudget;
 use anyhow::{Context, Result};
 use itertools::Itertools;
-use schist_models::{date_utc::DateUtc, drip::Drip};
-use schist_traits::dateable::Dateable;
+use schist_models::{DateUtc, Drip};
+use schist_traits::Dateable;
 
 use super::{transform_date::transform_date, transform_id::transform_id};
 
@@ -128,8 +128,8 @@ fn transform_budget_drip_id(
 mod test {
     use actualbudget_fakes::actualbudget_zero_budget::make_fake_actualbudget_zero_budget_builder;
     use actualbudget_models::ActualbudgetDate;
-    use schist_models::drip::Drip;
-    use schist_traits::dateable::Dateable;
+    use schist_models::Drip;
+    use schist_traits::Dateable;
 
     use crate::transform_state::transform_id::transform_id;
 
@@ -138,8 +138,8 @@ mod test {
     mod map_actualbudget_zero_budget_to_budget_drips {
         use actualbudget_fakes::actualbudget_zero_budget::make_fake_actualbudget_zero_budget_builder;
         use actualbudget_models::ActualbudgetDate;
-        use schist_models::drip::Drip;
-        use schist_traits::dateable::Dateable;
+        use schist_models::Drip;
+        use schist_traits::Dateable;
 
         use crate::transform_state::transform_budget_drips::map_actualbudget_zero_budget_to_budget_drips;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_categories.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_categories.rs
index ccc8639..5bea17c 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_categories.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_categories.rs
@@ -1,5 +1,5 @@
 use actualbudget_models::{ActualbudgetCategory, ActualbudgetZeroBudget};
-use schist_models::bucket::Bucket;
+use schist_models::Bucket;
 
 use super::transform_id;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_category_transfers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_category_transfers.rs
index bfbf7ac..78b466d 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_category_transfers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_category_transfers.rs
@@ -1,7 +1,7 @@
 use actualbudget_models::{ActualbudgetAccount, ActualbudgetTransaction};
 use anyhow::{bail, Context, Result};
 use itertools::Itertools;
-use schist_models::bucket_transfer::BucketTransfer;
+use schist_models::BucketTransfer;
 
 use super::{is_category_transfer, transform_id};
 
@@ -122,7 +122,7 @@ mod test {
         actualbudget_transaction::make_fake_actualbudget_transaction_builder,
     };
     use actualbudget_models::{ActualbudgetTransaction, ActualbudgetTransactionBuilder};
-    use schist_models::bucket_transfer::BucketTransfer;
+    use schist_models::BucketTransfer;
 
     use crate::transform_state::transform_id::transform_id;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs
index 57adae0..730442b 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_date.rs
@@ -1,6 +1,6 @@
 use actualbudget_models::ActualbudgetDate;
 use anyhow::Result;
-use schist_models::date_utc::DateUtc;
+use schist_models::DateUtc;
 
 pub fn transform_date(actualbudget_date: &ActualbudgetDate) -> Result<DateUtc> {
     actualbudget_date.to_iso_date().parse()
@@ -9,7 +9,7 @@ pub fn transform_date(actualbudget_date: &ActualbudgetDate) -> Result<DateUtc> {
 #[cfg(test)]
 mod test {
     use actualbudget_models::ActualbudgetDate;
-    use schist_models::date_utc::DateUtc;
+    use schist_models::DateUtc;
 
     use super::transform_date;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs
index 7d7f90b..7816df6 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_state.rs
@@ -1,8 +1,5 @@
 use anyhow::{bail, Context, Result};
-use schist_models::{
-    account::Account, bucket::Bucket, bucket_transfer::BucketTransfer, date_utc::DateUtc,
-    pipe::Pipe, transaction::Transaction,
-};
+use schist_models::{Account, Bucket, BucketTransfer, DateUtc, Pipe, Transaction};
 
 use crate::{actualbudget_state::ActualbudgetState, schist_state::SchistState};
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs
index a1b7c4d..7c4ece5 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_transactions.rs
@@ -1,6 +1,6 @@
 use actualbudget_models::{ActualbudgetAccount, ActualbudgetPayee, ActualbudgetTransaction};
 use anyhow::{Context, Result};
-use schist_models::transaction::Transaction;
+use schist_models::Transaction;
 
 use super::{is_not_category_transfer, transform_date, transform_id};
 
@@ -95,7 +95,7 @@ mod test {
         actualbudget_transaction::make_fake_actualbudget_transaction_builder,
     };
     use actualbudget_models::ActualbudgetDate;
-    use schist_models::date_utc::DateUtc;
+    use schist_models::DateUtc;
 
     use crate::transform_state::transform_id::transform_id;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_zero_budgets.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_zero_budgets.rs
index 07ecd56..999c3e8 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_zero_budgets.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/src/transform_state/transform_zero_budgets.rs
@@ -1,5 +1,5 @@
 use actualbudget_models::ActualbudgetZeroBudget;
-use schist_models::pipe::Pipe;
+use schist_models::Pipe;
 
 pub fn transform_zero_budgets(_actualbudget_zero_budgets: &[ActualbudgetZeroBudget]) -> Vec<Pipe> {
     todo!()
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_matchers.rs
index 599f31f..eaa1805 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_matchers.rs
@@ -1,4 +1,4 @@
-use schist_models::account::Account;
+use schist_models::Account;
 
 pub fn get_account_matchers() -> Vec<Box<dyn Fn(&Account) -> bool>> {
     vec![
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_transfer_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_transfer_matchers.rs
index f3e3037..34dfe8d 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_transfer_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/account_transfer_matchers.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use schist_models::{account::Account, account_transfer::AccountTransfer};
+use schist_models::{Account, AccountTransfer};
 
 use super::ACCOUNT_NAMES_DICT;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_matchers.rs
index 5f5ef4f..3821806 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_matchers.rs
@@ -1,4 +1,4 @@
-use schist_models::bucket::Bucket;
+use schist_models::Bucket;
 
 use super::bucket_names::BUCKET_NAMES;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transfer_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transfer_matchers.rs
index 038e4f7..c31b9bc 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transfer_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/bucket_transfer_matchers.rs
@@ -1,4 +1,4 @@
-use schist_models::{bucket::Bucket, bucket_transfer::BucketTransfer};
+use schist_models::{Bucket, BucketTransfer};
 
 use super::bucket_names::{BUCKET_NAME_GENERAL, BUCKET_NAME_SAVINGS};
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/budget_drip_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/budget_drip_matchers.rs
index bd42d76..85ad045 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/budget_drip_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/budget_drip_matchers.rs
@@ -1,7 +1,7 @@
 use std::sync::LazyLock;
 
-use schist_models::{bucket::Bucket, date_utc::DateUtc, drip::Drip};
-use schist_traits::dateable::Dateable;
+use schist_models::{Bucket, DateUtc, Drip};
+use schist_traits::Dateable;
 
 use crate::common::bucket_names::{
     BUCKET_NAME_BILLS, BUCKET_NAME_BILLS_FLEXIBLE, BUCKET_NAME_FOOD, BUCKET_NAME_GENERAL,
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/transaction_matchers.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/transaction_matchers.rs
index ea22054..e6c3f27 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/transaction_matchers.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/common/transaction_matchers.rs
@@ -1,4 +1,4 @@
-use schist_models::{account::Account, transaction::Transaction};
+use schist_models::{Account, Transaction};
 
 use super::ACCOUNT_NAMES_DICT;
 
diff --git a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/run.rs b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/run.rs
index 62e1159..aff034f 100644
--- a/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/run.rs
+++ b/transformers/actualbudget_transformer/actualbudget_to_schist_transformer/tests/run.rs
@@ -7,7 +7,7 @@ use common::{
     get_transaction_matchers, TestContext, TEST_IN_DB_URL, TEST_OUT_DB_URL,
 };
 use diesel::{Connection, SqliteConnection};
-use schist_models::pipe::Pipe;
+use schist_models::Pipe;
 use schist_queries::{
     account_transfers::get_all_account_transfers, accounts::get_all_accounts,
     bucket_transfers::get_all_bucket_transfers, buckets::get_all_buckets, drips::get_all_drips,