Skip to content

Commit aeebbff

Browse files
committed
fix(standup): fix assignable users
- use OR operator for excluding users using journal leave/wfh
1 parent 1c87ebf commit aeebbff

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

apps/standup/tasks.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,20 @@ def _get_next_conductors(daily_standup: DailyUserStandup) -> tuple[User, User]:
156156
assignable_user_qs = User.get_users_with_slack_user_id().filter(
157157
~models.Exists(
158158
Journal.objects.filter(
159+
models.Q(
160+
leave_type__in=[
161+
Journal.LeaveType.FULL,
162+
Journal.LeaveType.FIRST_HALF,
163+
],
164+
)
165+
| models.Q(
166+
wfh_type__in=[
167+
Journal.WorkFromHomeType.FULL,
168+
Journal.WorkFromHomeType.FIRST_HALF,
169+
],
170+
),
159171
user=models.OuterRef("id"),
160172
date=daily_standup.date,
161-
leave_type__in=[
162-
Journal.LeaveType.FULL,
163-
Journal.LeaveType.FIRST_HALF,
164-
],
165-
wfh_type__in=[
166-
Journal.WorkFromHomeType.FULL,
167-
Journal.WorkFromHomeType.FIRST_HALF,
168-
],
169173
),
170174
),
171175
assign_for_standup=True,

0 commit comments

Comments
 (0)