centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update final schedule to consider priority level for overrides

Browse source
This commit is contained in:
Matias Bordese 2022-11-28 15:23:46 -03:00
parent 356986a1e1
commit 3e8417e000
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/apps/schedules/models/on_call_schedule.py
View file

@ -319,6 +319,7 @@ class OnCallSchedule(PolymorphicModel):
resolved = []
pending = events
current_interval_idx = 0 # current scheduled interval being checked
current_type = OnCallSchedule.TYPE_ICAL_OVERRIDES # current calendar type
current_priority = None # current priority level being resolved
while pending:
@ -328,20 +329,17 @@ class OnCallSchedule(PolymorphicModel):
# exclude events without active users
continue
if ev["calendar_type"] == OnCallSchedule.TYPE_ICAL_OVERRIDES:
# include overrides from start
resolved.append(ev)
continue
# api/terraform shifts could be missing a priority; assume None means 0
priority = ev["priority_level"] or 0
if priority != current_priority:
if priority != current_priority or current_type != ev["calendar_type"]:
# update scheduled intervals on priority change
# and start from the beginning for the new priority level
# also for calendar event type (overrides first, then apply regular shifts)
resolved.sort(key=event_start_cmp_key)
intervals = _merge_intervals(resolved)
current_interval_idx = 0
current_priority = priority
current_type = ev["calendar_type"]
if current_interval_idx >= len(intervals):
# event outside scheduled intervals, add to resolved

29
engine/apps/schedules/tests/test_on_call_schedule.py
View file

@ -330,17 +330,23 @@ def test_final_schedule_events(make_organization, make_user_for_organization, ma
)
on_call_shift.add_rolling_users([[user]])
# override: 22-23 / E
override_data = {
"start": start_date + timezone.timedelta(hours=22),
"rotation_start": start_date + timezone.timedelta(hours=22),
"duration": timezone.timedelta(hours=1),
"schedule": schedule,
}
override = make_on_call_shift(
organization=organization, shift_type=CustomOnCallShift.TYPE_OVERRIDE, **override_data
overrides = (
# user, priority, start time (h), duration (hs)
(user_e, 0, 22, 1), # 22-23 / E
(user_a, 1, 22, 0.5), # 22-22:30 / A
)
override.add_rolling_users([[user_e]])
for user, priority, start_h, duration in overrides:
data = {
"start": start_date + timezone.timedelta(hours=start_h),
"rotation_start": start_date + timezone.timedelta(hours=start_h),
"duration": timezone.timedelta(hours=duration),
"priority_level": priority,
"schedule": schedule,
}
on_call_shift = make_on_call_shift(
organization=organization, shift_type=CustomOnCallShift.TYPE_OVERRIDE, **data
)
on_call_shift.add_rolling_users([[user]])
returned_events = schedule.final_events("UTC", start_date, days=1)
@ -357,7 +363,8 @@ def test_final_schedule_events(make_organization, make_user_for_organization, ma
(18, 1, "A", 1, False, False), # 18-19 A
(19, 1, None, None, True, False), # 19-20 gap
(20, 2, "D", 2, False, False), # 20-22 D
(22, 1, "E", None, False, True), # 22-23 E (override)
(22, 0.5, "A", 1, False, True), # 22-22:30 A (override the override)
(22.5, 0.5, "E", None, False, True), # 22:30-23 E (override)
(23, 1, "B", 1, False, False), # 23-00 B
)
expected_events = [