Merge pull request 'try to do better' (#30) from feature/new-sort into master

Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/30

.github/workflows/docker-publish.yml

@@ -29,3 +29,10 @@ jobs:
 
       - name: Logout
         run: docker logout 192.168.31.100:3847
+
+      - name: Trigger Coolify redeploy
+        run: |
+            curl -s -H "Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}" \
+              "http://192.168.31.100:8000/api/v1/deploy?uuid=msoc4skogk44ckc84wokocw0&force=true"
+
+

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?;

backend/src/services/expense_service.rs

@@ -150,11 +150,12 @@ impl ExpenseService {
 
         let mut result: Vec<MonthlyExpenseGroup> = 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,