From 5b4ff98cc5e97aab6ca9ff35cae6d087d1578bf0 Mon Sep 17 00:00:00 2001 From: arrelin Date: Fri, 6 Mar 2026 15:09:49 +0300 Subject: [PATCH] try to do better --- backend/src/main.rs | 2 +- backend/src/services/expense_service.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main.rs b/backend/src/main.rs index ed1cae5..1a2cc01 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -1,7 +1,7 @@ use family_budget::*; use sea_orm::DbErr; use sea_orm_migration::prelude::*; - +//TODO: НЕУДОБНОЕ РАСПОЛОЖЕНИЕ ДОБАВИТЬ РАСХОД + ИСТОРИЯ, ВОЗВРАЩАЕТ В НАЧАЛО ПОСЛЕ ДОБАВЛЕНИЯ РАСХОДА + ЗАКРЫВАЕТ ДОБАВИТЬ РАСХОД, ИСТОРИЯ НЕ ОБНОВЛЯЕТСЯ #[tokio::main] async fn main() -> Result<(), DbErr> { let db = establish_connection().await?; diff --git a/backend/src/services/expense_service.rs b/backend/src/services/expense_service.rs index 777511a..072f755 100644 --- a/backend/src/services/expense_service.rs +++ b/backend/src/services/expense_service.rs @@ -150,11 +150,12 @@ impl ExpenseService { let mut result: Vec = grouped .into_iter() - .map(|((year, month), expenses)| { + .map(|((year, month), mut expenses)| { let total_amount: Decimal = expenses .iter() .map(|e| e.amount) .sum(); + expenses.sort_by(|a, b| b.created_at.cmp(&a.created_at)); MonthlyExpenseGroup { year, month, -- 2.49.1