Nicer AB model module syntax

16 files changed, 29 insertions, 22 deletions

diff --git a/rust/actualbudget_models/src/lib.rs b/rust/actualbudget_models/src/lib.rs
index 2fae261..dbdd10c 100644
--- a/rust/actualbudget_models/src/lib.rs
+++ b/rust/actualbudget_models/src/lib.rs
@@ -1,6 +1,13 @@
-pub mod actualbudget_account;
-pub mod actualbudget_category;
-pub mod actualbudget_date;
+mod actualbudget_account;
+mod actualbudget_category;
+mod actualbudget_date;
+mod actualbudget_transaction;
+mod actualbudget_zero_budget;
+
 pub mod actualbudget_schema;
-pub mod actualbudget_transaction;
-pub mod actualbudget_zero_budget;
+
+pub use actualbudget_account::ActualbudgetAccount;
+pub use actualbudget_category::ActualbudgetCategory;
+pub use actualbudget_date::ActualbudgetDate;
+pub use actualbudget_transaction::ActualbudgetTransaction;
+pub use actualbudget_zero_budget::ActualbudgetZeroBudget;
diff --git a/rust/actualbudget_queries/src/actualbudget_accounts.rs b/rust/actualbudget_queries/src/actualbudget_accounts.rs
index 1d8843d..d499208 100644
--- a/rust/actualbudget_queries/src/actualbudget_accounts.rs
+++ b/rust/actualbudget_queries/src/actualbudget_accounts.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::actualbudget_account::ActualbudgetAccount;
+use actualbudget_models::ActualbudgetAccount;
 use actualbudget_schema::actualbudget_schema::accounts::{
     self as accounts_schema,
     dsl::accounts as accounts_table,
diff --git a/rust/actualbudget_queries/src/actualbudget_categories.rs b/rust/actualbudget_queries/src/actualbudget_categories.rs
index 5f33e1e..846faf5 100644
--- a/rust/actualbudget_queries/src/actualbudget_categories.rs
+++ b/rust/actualbudget_queries/src/actualbudget_categories.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::actualbudget_category::ActualbudgetCategory;
+use actualbudget_models::ActualbudgetCategory;
 use actualbudget_schema::actualbudget_schema::categories::dsl::categories;
 use diesel::{result::Error, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
 
diff --git a/rust/actualbudget_queries/src/actualbudget_transactions.rs b/rust/actualbudget_queries/src/actualbudget_transactions.rs
index 32eebd8..4dc38e8 100644
--- a/rust/actualbudget_queries/src/actualbudget_transactions.rs
+++ b/rust/actualbudget_queries/src/actualbudget_transactions.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::{actualbudget_date::ActualbudgetDate, actualbudget_transaction::ActualbudgetTransaction};
+use actualbudget_models::{ActualbudgetDate, ActualbudgetTransaction};
 use actualbudget_schema::actualbudget_schema::v_transactions::{
     self as transactions_schema,
     dsl::v_transactions as transactions_table,
diff --git a/rust/actualbudget_queries/src/actualbudget_zero_budgets.rs b/rust/actualbudget_queries/src/actualbudget_zero_budgets.rs
index 187fe8d..7366f86 100644
--- a/rust/actualbudget_queries/src/actualbudget_zero_budgets.rs
+++ b/rust/actualbudget_queries/src/actualbudget_zero_budgets.rs
@@ -1,5 +1,5 @@
 use anyhow::{Context, Result};
-use actualbudget_models::actualbudget_zero_budget::ActualbudgetZeroBudget;
+use actualbudget_models::ActualbudgetZeroBudget;
 use actualbudget_schema::actualbudget_schema::zero_budgets::dsl::zero_budgets as zero_budgets_table;
 use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
 
diff --git a/rust/actualbudget_queries/tests/common/get_reference_data.rs b/rust/actualbudget_queries/tests/common/get_reference_data.rs
index d317a00..0d4f19c 100644
--- a/rust/actualbudget_queries/tests/common/get_reference_data.rs
+++ b/rust/actualbudget_queries/tests/common/get_reference_data.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use actualbudget_models::{actualbudget_account::ActualbudgetAccount, actualbudget_category::ActualbudgetCategory};
-use actualbudget_queries::{actualbudget_accounts::get_all_actualbudget_accounts, actualbudget_categories::get_all_actualbudget_categories, actualbudget_transactions::{get_all_actualbudget_transactions, get_first_actualbudget_transaction_date}};
+use actualbudget_models::{ActualbudgetAccount, ActualbudgetCategory};
+use actualbudget_queries::{actualbudget_accounts::get_all_actualbudget_accounts, actualbudget_categories::get_all_actualbudget_categories};
 use diesel::SqliteConnection;
 
 use super::{account_names::ACCOUNT_NAMES, category_names::CATEGORY_NAMES};
diff --git a/rust/actualbudget_queries/tests/common/transaction_matchers.rs b/rust/actualbudget_queries/tests/common/transaction_matchers.rs
index f245723..4cbadeb 100644
--- a/rust/actualbudget_queries/tests/common/transaction_matchers.rs
+++ b/rust/actualbudget_queries/tests/common/transaction_matchers.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use actualbudget_models::{actualbudget_account::ActualbudgetAccount, actualbudget_category::ActualbudgetCategory, actualbudget_transaction::ActualbudgetTransaction};
+use actualbudget_models::{ActualbudgetAccount, ActualbudgetCategory, ActualbudgetTransaction};
 
 use super::{account_names::ACCOUNT_NAMES_DICT, category_names::CATEGORY_NAMES_DICT};
 
diff --git a/rust/actualbudget_queries/tests/common/zero_budget_matchers.rs b/rust/actualbudget_queries/tests/common/zero_budget_matchers.rs
index 46b893d..ac88d3b 100644
--- a/rust/actualbudget_queries/tests/common/zero_budget_matchers.rs
+++ b/rust/actualbudget_queries/tests/common/zero_budget_matchers.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use actualbudget_models::{actualbudget_category::ActualbudgetCategory, actualbudget_zero_budget::ActualbudgetZeroBudget};
+use actualbudget_models::{ActualbudgetCategory, ActualbudgetZeroBudget};
 
 use super::category_names::CATEGORY_NAMES_DICT;
 
diff --git a/rust/schist_actualbudget_importer/src/actualbudget_state.rs b/rust/schist_actualbudget_importer/src/actualbudget_state.rs
index a83a289..73698a5 100644
--- a/rust/schist_actualbudget_importer/src/actualbudget_state.rs
+++ b/rust/schist_actualbudget_importer/src/actualbudget_state.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::{actualbudget_account::ActualbudgetAccount, actualbudget_category::ActualbudgetCategory, actualbudget_date::ActualbudgetDate, actualbudget_transaction::ActualbudgetTransaction, actualbudget_zero_budget::ActualbudgetZeroBudget};
+use actualbudget_models::{ActualbudgetAccount, ActualbudgetCategory, ActualbudgetDate, ActualbudgetTransaction, ActualbudgetZeroBudget};
 use actualbudget_queries::{actualbudget_accounts::{get_all_actualbudget_accounts, get_category_transfers_account}, actualbudget_categories::get_all_actualbudget_categories, actualbudget_transactions::{get_all_actualbudget_transactions, get_first_actualbudget_transaction_date}, actualbudget_zero_budgets::get_all_actualbudget_zero_budgets};
 use anyhow::Result;
 use diesel::SqliteConnection;
diff --git a/rust/schist_actualbudget_importer/src/transform_state/is_category_transfer.rs b/rust/schist_actualbudget_importer/src/transform_state/is_category_transfer.rs
index 0f4299a..c82387c 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/is_category_transfer.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/is_category_transfer.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::{actualbudget_account::ActualbudgetAccount, actualbudget_transaction::ActualbudgetTransaction};
+use actualbudget_models::{ActualbudgetAccount, ActualbudgetTransaction};
 
 pub fn is_category_transfer(
     transaction: &ActualbudgetTransaction,
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_accounts.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_accounts.rs
index 1f926cc..c100377 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_accounts.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_accounts.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::actualbudget_account::ActualbudgetAccount;
+use actualbudget_models::ActualbudgetAccount;
 use schist_models::{account::Account, datetime_utc::DatetimeUtc};
 
 use super::transform_id;
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs
index e94a0c6..f4d0e3f 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_budget_updates.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use actualbudget_models::actualbudget_zero_budget::ActualbudgetZeroBudget;
+use actualbudget_models::ActualbudgetZeroBudget;
 use schist_models::{budget_update::BudgetUpdate, date_utc::DateUtc};
 
 use super::{transform_date, transform_id};
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs
index 4e7ff94..8b4a962 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_categories.rs
@@ -1,4 +1,4 @@
-use actualbudget_models::actualbudget_category::ActualbudgetCategory;
+use actualbudget_models::ActualbudgetCategory;
 use schist_models::category::Category;
 
 use super::transform_id;
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_category_transfers.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_category_transfers.rs
index cbd38ee..14b34f2 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_category_transfers.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_category_transfers.rs
@@ -1,6 +1,6 @@
 use actualbudget_models::{
-    actualbudget_account::ActualbudgetAccount,
-    actualbudget_transaction::ActualbudgetTransaction,
+    ActualbudgetAccount,
+    ActualbudgetTransaction,
 };
 use schist_models::category_transfer::CategoryTransfer;
 use core::panic;
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_date.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_date.rs
index 9b6ba5f..d45b8bb 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_date.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_date.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use actualbudget_models::actualbudget_date::ActualbudgetDate;
+use actualbudget_models::ActualbudgetDate;
 use schist_models::datetime_utc::DatetimeUtc;
 
 pub fn transform_date(actualbudget_date: &ActualbudgetDate) -> Result<DatetimeUtc> {
diff --git a/rust/schist_actualbudget_importer/src/transform_state/transform_transactions.rs b/rust/schist_actualbudget_importer/src/transform_state/transform_transactions.rs
index 3ffa0ab..3fbcb0f 100644
--- a/rust/schist_actualbudget_importer/src/transform_state/transform_transactions.rs
+++ b/rust/schist_actualbudget_importer/src/transform_state/transform_transactions.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use actualbudget_models::{actualbudget_account::ActualbudgetAccount, actualbudget_transaction::ActualbudgetTransaction};
+use actualbudget_models::{ActualbudgetAccount, ActualbudgetTransaction};
 use schist_models::{transaction::Transaction, transaction_categorisation::TransactionCategorisation};
 
 use super::{is_not_category_transfer, transform_date, transform_id};