From 5e0e99340ee7f20f6f375e8fe0d838ea4d859b1f Mon Sep 17 00:00:00 2001 From: tanshu Date: Mon, 9 Aug 2021 21:02:51 +0530 Subject: [PATCH] Fix: Beer Sale Report checking for wrong dates. --- .../barker/routers/reports/beer_sale_report.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/barker/barker/routers/reports/beer_sale_report.py b/barker/barker/routers/reports/beer_sale_report.py index 2bc0a41..b10a9b8 100644 --- a/barker/barker/routers/reports/beer_sale_report.py +++ b/barker/barker/routers/reports/beer_sale_report.py @@ -1,4 +1,4 @@ -from datetime import date, datetime, time, timedelta +from datetime import date, timedelta from operator import or_ from fastapi import APIRouter, Depends, Security @@ -26,13 +26,9 @@ def beer_consumption( user: UserToken = Security(get_user, scopes=["beer-sale-report"]), ): check_audit_permission(start_date, user.permissions) - s = datetime.combine(start_date, time()) + timedelta( - minutes=settings.NEW_DAY_OFFSET_MINUTES - settings.TIMEZONE_OFFSET_MINUTES - ) - f = datetime.combine(finish_date, time()) + timedelta( - days=1, minutes=settings.NEW_DAY_OFFSET_MINUTES - settings.TIMEZONE_OFFSET_MINUTES - ) - day = func.date_trunc("day", Voucher.date - timedelta(minutes=settings.NEW_DAY_OFFSET_MINUTES)).label("day") + day = func.date_trunc( + "day", Voucher.date + timedelta(minutes=settings.NEW_DAY_OFFSET_MINUTES - settings.TIMEZONE_OFFSET_MINUTES) + ).label("day") sum_ = func.sum(Inventory.quantity * ProductVersion.quantity).label("sum") with SessionFuture() as db: list_ = db.execute( @@ -41,8 +37,8 @@ def beer_consumption( .join(Kot.inventories) .join(Inventory.product) .where( - day >= s, - day <= f, + day >= start_date, + day <= finish_date, or_( ProductVersion.valid_from == None, # noqa: E711 ProductVersion.valid_from <= day,