From 7adaace61a4fe983eba5ded3aaaf624ce6fb9014 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Wed, 16 Oct 2024 18:22:55 +0100
Subject: Refactors some backend stuff to core lib

---
 backend/app/src/routes/account.rs       | 6 +++---
 backend/app/src/routes/balance.rs       | 3 ++-
 backend/app/src/routes/budget.rs        | 2 +-
 backend/app/src/routes/budget_update.rs | 2 +-
 backend/app/src/routes/category.rs      | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'backend/app/src/routes')

diff --git a/backend/app/src/routes/account.rs b/backend/app/src/routes/account.rs
index 7bbdb4f..7c29233 100644
--- a/backend/app/src/routes/account.rs
+++ b/backend/app/src/routes/account.rs
@@ -1,19 +1,19 @@
+use budgeting_app_core::models::account::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::models::account::Account;
 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> {
+pub async fn get_all_accounts(user_data_db: UserDataDb) -> Result<Json<Vec<Account>>, (Status, String)> {
     user_data_db
         .run(get_all_accounts_query)
         .await
         .map(Json)
-        .map_err(|_| Status { code: 500 })
+        .map_err(|err| (Status::InternalServerError, err.to_string()))
 }
 
 #[derive(Responder)]
diff --git a/backend/app/src/routes/balance.rs b/backend/app/src/routes/balance.rs
index f423c90..642aff1 100644
--- a/backend/app/src/routes/balance.rs
+++ b/backend/app/src/routes/balance.rs
@@ -1,7 +1,8 @@
+use budgeting_app_core::models::category_balance::CategoryBalance;
 use rocket::{get, http::Status, serde::json::Json};
 
 use crate::{
-    databases::UserDataDb, models::category_balance::CategoryBalance,
+    databases::UserDataDb,
     queries::category_balances::get_all_category_balances as get_all_category_balances_query,
 };
 
diff --git a/backend/app/src/routes/budget.rs b/backend/app/src/routes/budget.rs
index 67aae8e..64b9e06 100644
--- a/backend/app/src/routes/budget.rs
+++ b/backend/app/src/routes/budget.rs
@@ -1,9 +1,9 @@
+use budgeting_app_core::models::category_budget::CategoryBudget;
 use rocket::get;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 
 use crate::databases::UserDataDb;
-use crate::models::category_budget::CategoryBudget;
 use crate::queries;
 
 #[get("/budget/category?current")]
diff --git a/backend/app/src/routes/budget_update.rs b/backend/app/src/routes/budget_update.rs
index 7732c7b..6def31a 100644
--- a/backend/app/src/routes/budget_update.rs
+++ b/backend/app/src/routes/budget_update.rs
@@ -1,9 +1,9 @@
+use budgeting_app_core::models::budget_update::BudgetUpdate;
 use rocket::get;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 
 use crate::databases::UserDataDb;
-use crate::models::budget_update::BudgetUpdate;
 use crate::queries;
 
 #[get("/budget-update")]
diff --git a/backend/app/src/routes/category.rs b/backend/app/src/routes/category.rs
index 01fd8d1..43810e9 100644
--- a/backend/app/src/routes/category.rs
+++ b/backend/app/src/routes/category.rs
@@ -1,9 +1,9 @@
+use budgeting_app_core::models::category::Category;
 use rocket::get;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 
 use crate::databases::UserDataDb;
-use crate::models::category::Category;
 use crate::queries::categories::get_all_categories as get_all_categories_query;
 
 #[get("/category")]
-- 
cgit v1.2.3