Refactors importer to use core stuff

5 files changed, 22 insertions, 12 deletions

diff --git a/backend/app/src/routes/account.rs b/backend/app/src/routes/account.rs
index 7c29233..e4eb153 100644
--- a/backend/app/src/routes/account.rs
+++ b/backend/app/src/routes/account.rs
@@ -1,11 +1,13 @@
-use budgeting_app_core::models::account::Account;
+use budgeting_app_core::{
+    models::account::Account,
+    queries::accounts::{get_all_accounts as get_all_accounts_query, insert_account},
+};
 use diesel::result::DatabaseErrorKind;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 use rocket::{get, post, Responder};
 
 use crate::databases::UserDataDb;
-use crate::queries::accounts::{get_all_accounts as get_all_accounts_query, insert_account};
 
 #[get("/account")]
 pub async fn get_all_accounts(user_data_db: UserDataDb) -> Result<Json<Vec<Account>>, (Status, String)> {
diff --git a/backend/app/src/routes/balance.rs b/backend/app/src/routes/balance.rs
index 642aff1..2dcae7b 100644
--- a/backend/app/src/routes/balance.rs
+++ b/backend/app/src/routes/balance.rs
@@ -1,9 +1,11 @@
-use budgeting_app_core::models::category_balance::CategoryBalance;
+use budgeting_app_core::{
+    models::category_balance::CategoryBalance,
+    queries::category_balances::get_all_category_balances as get_all_category_balances_query,
+};
 use rocket::{get, http::Status, serde::json::Json};
 
 use crate::{
     databases::UserDataDb,
-    queries::category_balances::get_all_category_balances as get_all_category_balances_query,
 };
 
 #[get("/balance/category")]
diff --git a/backend/app/src/routes/budget.rs b/backend/app/src/routes/budget.rs
index 64b9e06..746635b 100644
--- a/backend/app/src/routes/budget.rs
+++ b/backend/app/src/routes/budget.rs
@@ -1,17 +1,19 @@
-use budgeting_app_core::models::category_budget::CategoryBudget;
+use budgeting_app_core::{
+    models::category_budget::CategoryBudget,
+    queries::category_budgets::get_most_recent_category_budget_per_category_id as get_most_recent_category_budget_per_category_id_query,
+};
 use rocket::get;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 
 use crate::databases::UserDataDb;
-use crate::queries;
 
 #[get("/budget/category?current")]
 pub async fn get_current_category_budget_per_category(
     user_data_db: UserDataDb,
 ) -> Result<Json<Vec<CategoryBudget>>, Status> {
     user_data_db
-        .run(queries::category_budgets::get_most_recent_category_budget_per_category_id)
+        .run(get_most_recent_category_budget_per_category_id_query)
         .await
         .map(Json)
         .map_err(|_| Status { code: 500 })
diff --git a/backend/app/src/routes/budget_update.rs b/backend/app/src/routes/budget_update.rs
index 6def31a..86dda9f 100644
--- a/backend/app/src/routes/budget_update.rs
+++ b/backend/app/src/routes/budget_update.rs
@@ -1,17 +1,19 @@
-use budgeting_app_core::models::budget_update::BudgetUpdate;
+use budgeting_app_core::{
+    models::budget_update::BudgetUpdate,
+    queries::budget_updates::get_all_budget_updates as get_all_budget_updates_query,
+};
 use rocket::get;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 
 use crate::databases::UserDataDb;
-use crate::queries;
 
 #[get("/budget-update")]
 pub async fn get_all_budget_updates(
     user_data_db: UserDataDb,
 ) -> Result<Json<Vec<BudgetUpdate>>, Status> {
     user_data_db
-        .run(queries::budget_updates::get_all_budget_updates)
+        .run(get_all_budget_updates_query)
         .await
         .map(Json)
         .map_err(|_| Status { code: 500 })
diff --git a/backend/app/src/routes/category.rs b/backend/app/src/routes/category.rs
index 43810e9..ca021fc 100644
--- a/backend/app/src/routes/category.rs
+++ b/backend/app/src/routes/category.rs
@@ -1,10 +1,12 @@
-use budgeting_app_core::models::category::Category;
+use budgeting_app_core::{
+    models::category::Category,
+    queries::categories::get_all_categories as get_all_categories_query,
+};
 use rocket::get;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 
 use crate::databases::UserDataDb;
-use crate::queries::categories::get_all_categories as get_all_categories_query;
 
 #[get("/category")]
 pub async fn get_all_categories(user_data_db: UserDataDb) -> Result<Json<Vec<Category>>, Status> {