diff options
| author | Joe Carstairs <me@joeac.net> | 2024-09-17 13:20:04 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2024-09-17 13:20:04 +0100 |
| commit | cd269b3540fb5e3a988c1b59d3763db360b1fb34 (patch) | |
| tree | a728403d8d5708ad29eeed2b391706b09a93fe4c /backend/src/queries | |
| parent | f0e3e0cfb183253e03b1a61ddecb7b9330d47fdb (diff) | |
many, many changes
Diffstat (limited to 'backend/src/queries')
| -rw-r--r-- | backend/src/queries/budget_updates/get_most_recent_with_category_id.rs | 8 | ||||
| -rw-r--r-- | backend/src/queries/category_budgets/get_most_recent_per_category_id.rs (renamed from backend/src/queries/category_budgets/get_all.rs) | 2 | ||||
| -rw-r--r-- | backend/src/queries/category_budgets/mod.rs | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/backend/src/queries/budget_updates/get_most_recent_with_category_id.rs b/backend/src/queries/budget_updates/get_most_recent_with_category_id.rs index a52e592..4753092 100644 --- a/backend/src/queries/budget_updates/get_most_recent_with_category_id.rs +++ b/backend/src/queries/budget_updates/get_most_recent_with_category_id.rs @@ -1,5 +1,8 @@ -use crate::schema::budget_updates::{ - self as budget_updates_schema, dsl::budget_updates as budget_updates_table, +use crate::{ + models::date_time_utc::DateTimeUtc, + schema::budget_updates::{ + self as budget_updates_schema, dsl::budget_updates as budget_updates_table, + }, }; use diesel::{dsl::max, result::Error, ExpressionMethods, QueryDsl, RunQueryDsl, SqliteConnection}; @@ -10,5 +13,6 @@ pub fn get_most_recent_budget_update_date_with_category_id( budget_updates_table .select(max(budget_updates_schema::date)) .filter(budget_updates_schema::category_id.eq(category_id)) + .filter(budget_updates_schema::date.le(DateTimeUtc::now().to_day_str())) .first(connection) } diff --git a/backend/src/queries/category_budgets/get_all.rs b/backend/src/queries/category_budgets/get_most_recent_per_category_id.rs index 6a8b040..6b76efd 100644 --- a/backend/src/queries/category_budgets/get_all.rs +++ b/backend/src/queries/category_budgets/get_most_recent_per_category_id.rs @@ -9,7 +9,7 @@ use crate::{ }; use diesel::{result::Error, SqliteConnection}; -pub fn get_all_category_budgets( +pub fn get_most_recent_category_budget_per_category_id( connection: &mut SqliteConnection, ) -> Result<Vec<CategoryBudget>, Error> { let category_ids: Vec<i32> = get_all_category_ids(connection)?; diff --git a/backend/src/queries/category_budgets/mod.rs b/backend/src/queries/category_budgets/mod.rs index 1a46cc3..29fc246 100644 --- a/backend/src/queries/category_budgets/mod.rs +++ b/backend/src/queries/category_budgets/mod.rs @@ -1,3 +1,3 @@ -mod get_all; +mod get_most_recent_per_category_id; -pub use self::get_all::get_all_category_budgets; +pub use self::get_most_recent_per_category_id::get_most_recent_category_budget_per_category_id; |
