Compare commits
13 Commits
0e856b8904
...
feature/ne
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b4ff98cc5 | ||
| 50f5610459 | |||
|
|
67f72e05a1 | ||
| 7e5d5332df | |||
|
|
7dc0ebf3c1 | ||
| f48abe37ea | |||
|
|
e9a588e479 | ||
| b000efe886 | |||
|
|
9eaa3de231 | ||
| 22dd91f7ce | |||
|
|
80f2fa55cd | ||
| 38ffa260b3 | |||
|
|
b90e002f28 |
7
.github/workflows/docker-publish.yml
vendored
7
.github/workflows/docker-publish.yml
vendored
@@ -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"
|
||||
|
||||
|
||||
|
||||
@@ -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?;
|
||||
|
||||
@@ -150,12 +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()
|
||||
.filter(|e| e.active)
|
||||
.map(|e| e.amount)
|
||||
.sum();
|
||||
expenses.sort_by(|a, b| b.created_at.cmp(&a.created_at));
|
||||
MonthlyExpenseGroup {
|
||||
year,
|
||||
month,
|
||||
|
||||
Reference in New Issue
Block a user