From 78930ab920cc898f7e9687651d2a574c2f1ba291 Mon Sep 17 00:00:00 2001 From: kolo Date: Wed, 15 Jul 2026 01:34:33 +0300 Subject: [PATCH] sort transactions newest-first in resident and user history; 40 transactions in creator history --- .../application/bot/admin_dialogs/residents_management.py | 4 ++-- src/dutylog/application/bot/user_dialogs/user_menu/history.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dutylog/application/bot/admin_dialogs/residents_management.py b/src/dutylog/application/bot/admin_dialogs/residents_management.py index 13e5cf3..21613fc 100644 --- a/src/dutylog/application/bot/admin_dialogs/residents_management.py +++ b/src/dutylog/application/bot/admin_dialogs/residents_management.py @@ -586,8 +586,8 @@ async def get_resident_history_data( return {"history_content": "Ошибка: резидент не найден", "transactions": [], "has_transactions": False} transactions = await transactions_repository.get_resident_history(resident_id) - transactions_sorted = sorted(transactions, key=lambda x: x.created_at) - last_10 = transactions_sorted[-10:] + transactions_sorted = sorted(transactions, key=lambda x: x.created_at, reverse=True) + last_10 = transactions_sorted[:10] resident_name = resident.real_name if resident.real_name else "Без имени" diff --git a/src/dutylog/application/bot/user_dialogs/user_menu/history.py b/src/dutylog/application/bot/user_dialogs/user_menu/history.py index e6ec31e..300c2e4 100644 --- a/src/dutylog/application/bot/user_dialogs/user_menu/history.py +++ b/src/dutylog/application/bot/user_dialogs/user_menu/history.py @@ -41,8 +41,8 @@ async def get_history_data( return {"history_content": history_text, "transactions": [], "has_transactions": False} transactions = await transactions_repository.get_resident_history(resident.id) - transactions_sorted = sorted(transactions, key=lambda x: x.created_at) - last_10 = transactions_sorted[-10:] + transactions_sorted = sorted(transactions, key=lambda x: x.created_at, reverse=True) + last_10 = transactions_sorted[:10] if not last_10: history_text = "📜 История операций\n\n👤 Ваши операции:\nИстория операций пуста\n\n"