diff --git a/services/time_tracking.py b/services/time_tracking.py index 1d191e8..d76c361 100644 --- a/services/time_tracking.py +++ b/services/time_tracking.py @@ -22,12 +22,15 @@ class TimeTrackingService(BaseService): ) ) .join( - User.is_deleted == False + User, + PaymentRecord.user_id == User.id ) .where( func.date(func.date_trunc('month', PaymentRecord.start_date)) == request.date, func.date(func.date_trunc('month', PaymentRecord.end_date)) == request.date, PaymentRecord.start_date == PaymentRecord.end_date, + User.is_deleted == False + # PaymentRecord.user_id.in_(request.user_ids) ) )