This commit is contained in:
2026-03-17 20:27:30 +03:00
parent d05f9c3042
commit c80faeb665
4 changed files with 9 additions and 205 deletions
@@ -139,7 +139,6 @@ class HoursTransactionsRepository:
is_active: bool = True,
remark: str | None = None,
) -> list[tuple[HoursTransaction, Resident | None]]:
"""Начисляет часы всем резидентам комнаты с флагом per_room=True"""
residents = await self.residents_dao.get_by_room(room_id)
results = []
@@ -156,31 +155,7 @@ class HoursTransactionsRepository:
return results
async def remove_hours_from_room(
self,
room_id: int,
amount: int,
admin_id: int | None = None,
remark: str | None = None,
) -> list[tuple[HoursTransaction, Resident | None]]:
"""Списывает часы у всех резидентов комнаты с флагом per_room=True"""
residents = await self.residents_dao.get_by_room(room_id)
results = []
for resident in residents:
result = await self.move_hours_to_completed(
resident_id=resident.id,
amount=amount,
admin_id=admin_id,
remark=remark,
per_room=True,
)
results.append(result)
return results
async def get_room_transactions(self, room_id: int) -> list[HoursTransaction]:
"""Получает все транзакции резидентов комнаты с флагом per_room=True"""
residents = await self.residents_dao.get_by_room(room_id)
all_transactions = []
@@ -189,6 +164,5 @@ class HoursTransactionsRepository:
room_transactions = [t for t in transactions if t.per_room]
all_transactions.extend(room_transactions)
# Сортируем по дате создания
all_transactions.sort(key=lambda t: t.created_at, reverse=True)
return all_transactions