diff options
| author | Joe Carstairs <me@joeac.net> | 2024-10-16 18:22:55 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2024-10-17 06:55:02 +0100 |
| commit | 7adaace61a4fe983eba5ded3aaaf624ce6fb9014 (patch) | |
| tree | 6e0697f9dbb6e249c60af5a92479a86316c55221 /backend/app/src/queries | |
| parent | 27b95c9186bd45edd4c982a7cc89cf69cf2c5d46 (diff) | |
Refactors some backend stuff to core lib
Diffstat (limited to 'backend/app/src/queries')
13 files changed, 25 insertions, 27 deletions
diff --git a/backend/app/src/queries/accounts/get_all.rs b/backend/app/src/queries/accounts/get_all.rs index 12941ac..bc67f77 100644 --- a/backend/app/src/queries/accounts/get_all.rs +++ b/backend/app/src/queries/accounts/get_all.rs @@ -1,7 +1,6 @@ +use budgeting_app_core::{models::account::Account, schema::accounts::dsl::accounts}; use diesel::{result::Error, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; -use crate::{models::account::Account, schema::accounts::dsl::accounts}; - pub fn get_all_accounts(connection: &mut SqliteConnection) -> Result<Vec<Account>, Error> { accounts.select(Account::as_select()).load(connection) } diff --git a/backend/app/src/queries/accounts/insert.rs b/backend/app/src/queries/accounts/insert.rs index c20cf60..1d1a323 100644 --- a/backend/app/src/queries/accounts/insert.rs +++ b/backend/app/src/queries/accounts/insert.rs @@ -1,9 +1,10 @@ +use budgeting_app_core::{ + models::account::Account, + schema::accounts::dsl::accounts as accounts_table, +}; use diesel::prelude::*; use diesel::result::Error; -use crate::models::account::Account; -use crate::schema::accounts::dsl::accounts as accounts_table; - pub fn insert_account( accounts: &[Account], connection: &mut SqliteConnection, diff --git a/backend/app/src/queries/budget_updates/get_all.rs b/backend/app/src/queries/budget_updates/get_all.rs index 97f2f2f..e6e4b59 100644 --- a/backend/app/src/queries/budget_updates/get_all.rs +++ b/backend/app/src/queries/budget_updates/get_all.rs @@ -1,4 +1,4 @@ -use crate::{ +use budgeting_app_core::{ models::budget_update::BudgetUpdate, schema::budget_updates::dsl::budget_updates as budget_updates_table, }; diff --git a/backend/app/src/queries/budget_updates/get_first_with_date.rs b/backend/app/src/queries/budget_updates/get_first_with_date.rs index a2824be..3856557 100644 --- a/backend/app/src/queries/budget_updates/get_first_with_date.rs +++ b/backend/app/src/queries/budget_updates/get_first_with_date.rs @@ -1,4 +1,4 @@ -use crate::{ +use budgeting_app_core::{ models::budget_update::BudgetUpdate, schema::budget_updates::{ self as budget_updates_schema, dsl::budget_updates as budget_updates_table, diff --git a/backend/app/src/queries/budget_updates/get_most_recent_with_category_id.rs b/backend/app/src/queries/budget_updates/get_most_recent_with_category_id.rs index 4753092..55012f5 100644 --- a/backend/app/src/queries/budget_updates/get_most_recent_with_category_id.rs +++ b/backend/app/src/queries/budget_updates/get_most_recent_with_category_id.rs @@ -1,4 +1,4 @@ -use crate::{ +use budgeting_app_core::{ models::date_time_utc::DateTimeUtc, schema::budget_updates::{ self as budget_updates_schema, dsl::budget_updates as budget_updates_table, diff --git a/backend/app/src/queries/categories/get_all.rs b/backend/app/src/queries/categories/get_all.rs index db5a073..b6ec756 100644 --- a/backend/app/src/queries/categories/get_all.rs +++ b/backend/app/src/queries/categories/get_all.rs @@ -1,4 +1,4 @@ -use crate::{models::category::Category, schema::categories::dsl::categories as categories_table}; +use budgeting_app_core::{models::category::Category, schema::categories::dsl::categories as categories_table}; use diesel::{result::Error, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; pub fn get_all_categories(connection: &mut SqliteConnection) -> Result<Vec<Category>, Error> { diff --git a/backend/app/src/queries/categories/get_all_ids.rs b/backend/app/src/queries/categories/get_all_ids.rs index 7c7c912..48d5e57 100644 --- a/backend/app/src/queries/categories/get_all_ids.rs +++ b/backend/app/src/queries/categories/get_all_ids.rs @@ -1,4 +1,4 @@ -use crate::schema::categories::{self as categories_schema, dsl::categories as categories_table}; +use budgeting_app_core::schema::categories::{self as categories_schema, dsl::categories as categories_table}; use diesel::{result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; pub fn get_all_category_ids(connection: &mut SqliteConnection) -> Result<Vec<i32>, Error> { diff --git a/backend/app/src/queries/category_balances/get_all.rs b/backend/app/src/queries/category_balances/get_all.rs index 713fbeb..7ee474a 100644 --- a/backend/app/src/queries/category_balances/get_all.rs +++ b/backend/app/src/queries/category_balances/get_all.rs @@ -1,5 +1,5 @@ +use budgeting_app_core::models::category_balance::CategoryBalance; use crate::{ - models::category_balance::CategoryBalance, queries::{ budget_updates::get_all_budget_updates, categories::get_all_categories, diff --git a/backend/app/src/queries/category_budgets/get_most_recent_per_category_id.rs b/backend/app/src/queries/category_budgets/get_most_recent_per_category_id.rs index 6b76efd..b71a5fb 100644 --- a/backend/app/src/queries/category_budgets/get_most_recent_per_category_id.rs +++ b/backend/app/src/queries/category_budgets/get_most_recent_per_category_id.rs @@ -1,11 +1,9 @@ -use crate::{ - models::{budget::Budget, category_budget::CategoryBudget}, - queries::{ - budget_updates::{ - get_first_budget_update_with_date, get_most_recent_budget_update_date_with_category_id, - }, - categories::get_all_category_ids, +use budgeting_app_core::models::{budget::Budget, category_budget::CategoryBudget}; +use crate::queries::{ + budget_updates::{ + get_first_budget_update_with_date, get_most_recent_budget_update_date_with_category_id, }, + categories::get_all_category_ids, }; use diesel::{result::Error, SqliteConnection}; diff --git a/backend/app/src/queries/category_transfers/sum_quantity_per_from_category_id.rs b/backend/app/src/queries/category_transfers/sum_quantity_per_from_category_id.rs index ae3a51a..3c077aa 100644 --- a/backend/app/src/queries/category_transfers/sum_quantity_per_from_category_id.rs +++ b/backend/app/src/queries/category_transfers/sum_quantity_per_from_category_id.rs @@ -1,8 +1,8 @@ -use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; - -use crate::schema::category_transfers::{ - self as category_transfers_schema, dsl::category_transfers as category_transfers_table, +use budgeting_app_core::schema::category_transfers::{ + self as category_transfers_schema, + dsl::category_transfers as category_transfers_table, }; +use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; pub fn sum_category_transfer_quantity_per_from_category_id( connection: &mut SqliteConnection, diff --git a/backend/app/src/queries/category_transfers/sum_quantity_per_to_category_id.rs b/backend/app/src/queries/category_transfers/sum_quantity_per_to_category_id.rs index fe6f3a7..6e81d7d 100644 --- a/backend/app/src/queries/category_transfers/sum_quantity_per_to_category_id.rs +++ b/backend/app/src/queries/category_transfers/sum_quantity_per_to_category_id.rs @@ -1,8 +1,8 @@ -use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; - -use crate::schema::category_transfers::{ - self as category_transfers_schema, dsl::category_transfers as category_transfers_table, +use budgeting_app_core::schema::category_transfers::{ + self as category_transfers_schema, + dsl::category_transfers as category_transfers_table, }; +use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; pub fn sum_category_transfer_quantity_per_to_category_id( connection: &mut SqliteConnection, diff --git a/backend/app/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs b/backend/app/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs index 7f93e0c..90dc990 100644 --- a/backend/app/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs +++ b/backend/app/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs @@ -1,4 +1,4 @@ -use crate::schema::transaction_categorisations::{ +use budgeting_app_core::schema::transaction_categorisations::{ self as transaction_categorisations_schema, dsl::transaction_categorisations as transaction_categorisations_table, }; diff --git a/backend/app/src/queries/transaction_categorisations/sum_quantity_per_to_category_id.rs b/backend/app/src/queries/transaction_categorisations/sum_quantity_per_to_category_id.rs deleted file mode 100644 index e69de29..0000000 --- a/backend/app/src/queries/transaction_categorisations/sum_quantity_per_to_category_id.rs +++ /dev/null |
