try to do better
This commit is contained in:
@@ -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?;
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
Reference in New Issue
Block a user