Arrelin/family_budget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'try to do better' (#30) from feature/new-sort into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 3m47s
Details

Browse Source 
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/30
This commit was merged in pull request #30.
This commit is contained in:
Arrelin
2026-03-06 15:10:20 +03:00
parent 50f5610459 5b4ff98cc5
commit 0f72d62d3e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main.rs
View File

@@ -1,7 +1,7 @@
use family_budget::*; use family_budget::*;
use sea_orm::DbErr; use sea_orm::DbErr;
use sea_orm_migration::prelude::*; use sea_orm_migration::prelude::*;
//TODO: НЕУДОБНОЕ РАСПОЛОЖЕНИЕ ДОБАВИТЬ РАСХОД + ИСТОРИЯ, ВОЗВРАЩАЕТ В НАЧАЛО ПОСЛЕ ДОБАВЛЕНИЯ РАСХОДА + ЗАКРЫВАЕТ ДОБАВИТЬ РАСХОД, ИСТОРИЯ НЕ ОБНОВЛЯЕТСЯ
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), DbErr> { async fn main() -> Result<(), DbErr> {
let db = establish_connection().await?; let db = establish_connection().await?;

3
backend/src/services/expense_service.rs
View File

@@ -150,11 +150,12 @@ impl ExpenseService {
let mut result: Vec<MonthlyExpenseGroup> = grouped let mut result: Vec<MonthlyExpenseGroup> = grouped
.into_iter() .into_iter()
.map(|((year, month), expenses)| { .map(|((year, month), mut expenses)| {
let total_amount: Decimal = expenses let total_amount: Decimal = expenses
.iter() .iter()
.map(|e| e.amount) .map(|e| e.amount)
.sum(); .sum();
expenses.sort_by(|a, b| b.created_at.cmp(&a.created_at));
MonthlyExpenseGroup { MonthlyExpenseGroup {
year, year,
month, month,