Refactors rust code into workspace

5 files changed, 14 insertions, 28 deletions

diff --git a/backend/app/Cargo.toml b/backend/app/Cargo.toml
index 69e1ed1..efb8280 100644
--- a/backend/app/Cargo.toml
+++ b/backend/app/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 
 [dependencies]
 budgeting_app_core = { path = "../core" }
-chrono = { version = "0.4.38", features = ["serde"] }
-cfg-if = "1.0.0"
-diesel = { version = "2.2.0", features = ["sqlite"] }
-diesel_migrations = "2.2.0"
-dotenvy = "0.15.7"
-rocket = { version = "0.5.1", features = ["json"] }
-rocket_sync_db_pools = { version = "0.1.0", features = ["diesel_sqlite_pool"] }
-rusqlite = { version = "0.32.1", features = ["bundled"] }
+chrono = { workspace = true, features = ["serde"] }
+cfg-if = { workspace = true }
+diesel = { workspace = true, features = ["sqlite"] }
+diesel_migrations = { workspace = true }
+dotenvy = { workspace = true }
+rocket = { workspace = true, features = ["json"] }
+rocket_sync_db_pools = { workspace = true, features = ["diesel_sqlite_pool"] }
+rusqlite = { workspace = true, features = ["bundled"] }
diff --git a/backend/app/src/main.rs b/backend/app/src/main.rs
index 152f958..dca6096 100644
--- a/backend/app/src/main.rs
+++ b/backend/app/src/main.rs
@@ -8,9 +8,7 @@ use rocket::{launch, routes, Build, Rocket};
 use crate::databases::UserDataDb;
 
 pub mod databases;
-pub mod queries;
 pub mod routes;
-pub mod utils;
 
 fn run_database_migrations(connection: &mut SqliteConnection) {
     connection
diff --git a/backend/app/src/routes/account.rs b/backend/app/src/routes/account.rs
index e4eb153..96f1f38 100644
--- a/backend/app/src/routes/account.rs
+++ b/backend/app/src/routes/account.rs
@@ -1,8 +1,7 @@
 use budgeting_app_core::{
     models::account::Account,
-    queries::accounts::{get_all_accounts as get_all_accounts_query, insert_account},
+    queries::accounts::{get_all_accounts as get_all_accounts_query, insert_accounts},
 };
-use diesel::result::DatabaseErrorKind;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 use rocket::{get, post, Responder};
@@ -39,21 +38,13 @@ pub async fn create_account(
     let accounts_vec = vec![account.clone()];
 
     let num_rows_inserted = user_data_db
-        .run(move |connection| insert_account(&accounts_vec, connection))
+        .run(move |connection| insert_accounts(&accounts_vec, connection))
         .await;
 
     match num_rows_inserted {
         Ok(_) => CreateAccountResponder::Created(Json(account)),
-        Err(err) => match err {
-            diesel::result::Error::DatabaseError(DatabaseErrorKind::UniqueViolation, info) => {
-                let column = info.column_name().unwrap_or("account");
-                CreateAccountResponder::BadRequest(format!(
-                    "Error creating account: {column} was not unique."
-                ))
-            }
-            _ => CreateAccountResponder::InternalServerError(format!(
+        Err(err) => CreateAccountResponder::InternalServerError(format!(
                 "Error creating account: {err}"
             )),
-        },
     }
 }
diff --git a/backend/app/src/routes/balance.rs b/backend/app/src/routes/balance.rs
index 2dcae7b..21adb3b 100644
--- a/backend/app/src/routes/balance.rs
+++ b/backend/app/src/routes/balance.rs
@@ -1,13 +1,10 @@
 use budgeting_app_core::{
     models::category_balance::CategoryBalance,
-    queries::category_balances::get_all_category_balances as get_all_category_balances_query,
+    queries::categories::get_all_category_balances as get_all_category_balances_query,
 };
 use rocket::{get, http::Status, serde::json::Json};
 
-use crate::{
-    databases::UserDataDb,
-};
-
+use crate::databases::UserDataDb;
 #[get("/balance/category")]
 pub async fn get_all_category_balances(
     user_data_db: UserDataDb,
diff --git a/backend/app/src/routes/budget.rs b/backend/app/src/routes/budget.rs
index 746635b..dc0802a 100644
--- a/backend/app/src/routes/budget.rs
+++ b/backend/app/src/routes/budget.rs
@@ -1,6 +1,6 @@
 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,
+    queries::categories::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;