mirror of
https://github.com/koloideal/DutyLog.git
synced 2026-06-10 10:25:29 +03:00
update
This commit is contained in:
@@ -31,3 +31,30 @@ class RoomHoursTransactionsDAO:
|
||||
await self.session.commit()
|
||||
await self.session.refresh(transaction)
|
||||
return transaction
|
||||
|
||||
async def get_by_period(self, start_date, end_date) -> list[RoomHoursTransaction]:
|
||||
from datetime import datetime, time
|
||||
|
||||
start_datetime = datetime.combine(start_date, time.min)
|
||||
end_datetime = datetime.combine(end_date, time.max)
|
||||
|
||||
result = await self.session.execute(
|
||||
select(RoomHoursTransaction)
|
||||
.where(RoomHoursTransaction.created_at >= start_datetime)
|
||||
.where(RoomHoursTransaction.created_at <= end_datetime)
|
||||
.order_by(RoomHoursTransaction.created_at.asc())
|
||||
)
|
||||
return list(result.scalars().all())
|
||||
async def get_by_period(self, start_date, end_date) -> list[RoomHoursTransaction]:
|
||||
from datetime import datetime, time
|
||||
|
||||
start_datetime = datetime.combine(start_date, time.min)
|
||||
end_datetime = datetime.combine(end_date, time.max)
|
||||
|
||||
result = await self.session.execute(
|
||||
select(RoomHoursTransaction)
|
||||
.where(RoomHoursTransaction.created_at >= start_datetime)
|
||||
.where(RoomHoursTransaction.created_at <= end_datetime)
|
||||
.order_by(RoomHoursTransaction.created_at.asc())
|
||||
)
|
||||
return list(result.scalars().all())
|
||||
|
||||
@@ -115,3 +115,8 @@ class RoomHoursTransactionsRepository:
|
||||
self, transaction_id: int
|
||||
) -> RoomHoursTransaction | None:
|
||||
return await self.transactions_dao.get_by_id(transaction_id)
|
||||
|
||||
async def get_by_period(self, start_date, end_date) -> list[RoomHoursTransaction]:
|
||||
return await self.transactions_dao.get_by_period(start_date, end_date)
|
||||
async def get_by_period(self, start_date, end_date) -> list[RoomHoursTransaction]:
|
||||
return await self.transactions_dao.get_by_period(start_date, end_date)
|
||||
|
||||
@@ -144,6 +144,7 @@ class ServiceProvider(Provider):
|
||||
def get_report_service(
|
||||
self,
|
||||
hours_transactions_repository: HoursTransactionsRepository,
|
||||
room_hours_transactions_repository: RoomHoursTransactionsRepository,
|
||||
residents_repository: ResidentsRepository,
|
||||
rooms_repository: RoomsRepository,
|
||||
floors_repository: FloorsRepository,
|
||||
@@ -151,6 +152,7 @@ class ServiceProvider(Provider):
|
||||
) -> ReportService:
|
||||
return ReportService(
|
||||
hours_transactions_repository,
|
||||
room_hours_transactions_repository,
|
||||
residents_repository,
|
||||
rooms_repository,
|
||||
floors_repository,
|
||||
|
||||
Reference in New Issue
Block a user