From 4f907e965b611f082c2b081bc92d8e8e17843c7a Mon Sep 17 00:00:00 2001 From: tanshu Date: Sun, 26 Sep 2021 09:34:16 +0530 Subject: [PATCH] Fix: Incentives was not working --- brewman/brewman/routers/incentive.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/brewman/brewman/routers/incentive.py b/brewman/brewman/routers/incentive.py index f28f9836..10e2c6ce 100644 --- a/brewman/brewman/routers/incentive.py +++ b/brewman/brewman/routers/incentive.py @@ -221,10 +221,13 @@ def get_employees( db: Session, ) -> List[schema_in.IncentiveEmployee]: details = [] - employees = db.execute( - select(Employee) - .where(Employee.joining_date <= finish_date, or_(Employee.is_active, Employee.leaving_date >= start_date)) - .order_by(Employee.cost_centre_id, Employee.designation, Employee.name) + employees = ( + db.execute( + select(Employee) + .where(Employee.joining_date <= finish_date, or_(Employee.is_active, Employee.leaving_date >= start_date)) + .order_by(Employee.cost_centre_id, Employee.designation, Employee.name) + ) + .scalars() .all() )