Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update schedule events internal API to return default priority level #4697

Merged
merged 1 commit into from
Jul 18, 2024
Merged

Update schedule events internal API to return default priority level #4697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/apps/api/tests/test_oncall_shift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@ def test_on_call_shift_preview_without_users(
"is_override": False,
"is_empty": True,
"is_gap": False,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [],
"source": "web",
Expand Down
4 changes: 2 additions & 2 deletions engine/apps/api/tests/test_schedules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ def test_filter_events_overrides(
}
],
"missing_users": [],
"priority_level": None,
"priority_level": 0,
"source": "api",
"calendar_type": OnCallSchedule.OVERRIDES,
"is_empty": False,
Expand Down Expand Up @@ -1307,7 +1307,7 @@ def test_filter_events_final_schedule(
"end": start_date + timezone.timedelta(hours=start + duration),
"is_gap": is_gap,
"is_override": is_override,
"priority_level": priority,
"priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start),
"user": user,
}
Expand Down
2 changes: 1 addition & 1 deletion engine/apps/schedules/models/on_call_schedule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ def filter_events(
for user in shift["users"]
],
"missing_users": shift["missing_users"],
"priority_level": shift["priority"] if shift["priority"] != 0 else None,
"priority_level": shift["priority"] or 0,
"source": shift["source"],
"calendar_type": shift["calendar_type"],
"is_empty": len(shift["users"]) == 0 and not is_gap,
Expand Down
22 changes: 11 additions & 11 deletions engine/apps/schedules/tests/test_on_call_schedule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def test_filter_events(make_organization, make_user_for_organization, make_sched
"is_override": True,
"is_empty": False,
"is_gap": False,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [
{
Expand Down Expand Up @@ -178,7 +178,7 @@ def test_filter_events_include_gaps(make_organization, make_user_for_organizatio
"is_override": False,
"is_empty": False,
"is_gap": True,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [],
"shift": {"pk": None},
Expand Down Expand Up @@ -213,7 +213,7 @@ def test_filter_events_include_gaps(make_organization, make_user_for_organizatio
"is_override": False,
"is_empty": False,
"is_gap": True,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [],
"shift": {"pk": None},
Expand Down Expand Up @@ -263,7 +263,7 @@ def test_filter_events_include_shift_info(
"is_override": False,
"is_empty": False,
"is_gap": True,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [],
"shift": {"pk": None},
Expand Down Expand Up @@ -302,7 +302,7 @@ def test_filter_events_include_shift_info(
"is_override": False,
"is_empty": False,
"is_gap": True,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [],
"shift": {"pk": None},
Expand Down Expand Up @@ -512,7 +512,7 @@ def test_final_schedule_events(
"end": start_date + timezone.timedelta(hours=start + duration),
"is_gap": is_gap,
"is_override": is_override,
"priority_level": priority,
"priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start),
"user": user,
"shift": (
Expand Down Expand Up @@ -599,7 +599,7 @@ def test_final_schedule_override_no_priority_shift(
"calendar_type": 1 if is_override else 0,
"end": start_date + timezone.timedelta(hours=start + duration),
"is_override": is_override,
"priority_level": priority,
"priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
"user": user,
}
Expand Down Expand Up @@ -679,7 +679,7 @@ def test_final_schedule_override_split(
"calendar_type": 1 if is_override else 0,
"end": start_date + timezone.timedelta(hours=start + duration),
"is_override": is_override,
"priority_level": priority,
"priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
"user": user,
}
Expand Down Expand Up @@ -1051,7 +1051,7 @@ def test_preview_shift_no_user(make_organization, make_user_for_organization, ma
"is_override": False,
"is_empty": True,
"is_gap": False,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [],
"shift": {"pk": new_shift.public_primary_key},
Expand Down Expand Up @@ -1130,7 +1130,7 @@ def test_preview_override_shift(make_organization, make_user_for_organization, m
"is_override": True,
"is_empty": False,
"is_gap": False,
"priority_level": None,
"priority_level": 0,
"missing_users": [],
"users": [
{
Expand All @@ -1156,7 +1156,7 @@ def test_preview_override_shift(make_organization, make_user_for_organization, m
expected_events = [
{
"end": start_date + timezone.timedelta(hours=start + duration),
"priority_level": priority,
"priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
"user": user,
"is_override": is_override,
Expand Down
Loading