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

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

Browse source 
No need to change 0 to `None` in priority level when returning schedule
events (related to this
[thread](https://raintank-corp.slack.com/archives/C0229FD3CE9/p1721239227358309?thread_ts=1721148066.857589&cid=C0229FD3CE9))
This commit is contained in:
Matias Bordese 2024-07-18 11:15:58 -03:00 • committed by GitHub
parent 7777a6003a
commit 1c33964543
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/apps/api/tests/test_oncall_shift.py
View file

@ -1778,7 +1778,7 @@ def test_on_call_shift_preview_without_users(
"is_override": False, "is_override": False,
"is_empty": True, "is_empty": True,
"is_gap": False, "is_gap": False,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [], "users": [],
"source": "web", "source": "web",

4
engine/apps/api/tests/test_schedules.py
View file

@ -1201,7 +1201,7 @@ def test_filter_events_overrides(
} }
], ],
"missing_users": [], "missing_users": [],
"priority_level": None, "priority_level": 0,
"source": "api", "source": "api",
"calendar_type": OnCallSchedule.OVERRIDES, "calendar_type": OnCallSchedule.OVERRIDES,
"is_empty": False, "is_empty": False,
@ -1307,7 +1307,7 @@ def test_filter_events_final_schedule(
"end": start_date + timezone.timedelta(hours=start + duration), "end": start_date + timezone.timedelta(hours=start + duration),
"is_gap": is_gap, "is_gap": is_gap,
"is_override": is_override, "is_override": is_override,
"priority_level": priority, "priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start), "start": start_date + timezone.timedelta(hours=start),
"user": user, "user": user,
} }

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

@ -412,7 +412,7 @@ class OnCallSchedule(PolymorphicModel):
for user in shift["users"] for user in shift["users"]
], ],
"missing_users": shift["missing_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"], "source": shift["source"],
"calendar_type": shift["calendar_type"], "calendar_type": shift["calendar_type"],
"is_empty": len(shift["users"]) == 0 and not is_gap, "is_empty": len(shift["users"]) == 0 and not is_gap,

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

@ -120,7 +120,7 @@ def test_filter_events(make_organization, make_user_for_organization, make_sched
"is_override": True, "is_override": True,
"is_empty": False, "is_empty": False,
"is_gap": False, "is_gap": False,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [ "users": [
{ {
@ -178,7 +178,7 @@ def test_filter_events_include_gaps(make_organization, make_user_for_organizatio
"is_override": False, "is_override": False,
"is_empty": False, "is_empty": False,
"is_gap": True, "is_gap": True,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [], "users": [],
"shift": {"pk": None}, "shift": {"pk": None},
@ -213,7 +213,7 @@ def test_filter_events_include_gaps(make_organization, make_user_for_organizatio
"is_override": False, "is_override": False,
"is_empty": False, "is_empty": False,
"is_gap": True, "is_gap": True,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [], "users": [],
"shift": {"pk": None}, "shift": {"pk": None},
@ -263,7 +263,7 @@ def test_filter_events_include_shift_info(
"is_override": False, "is_override": False,
"is_empty": False, "is_empty": False,
"is_gap": True, "is_gap": True,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [], "users": [],
"shift": {"pk": None}, "shift": {"pk": None},
@ -302,7 +302,7 @@ def test_filter_events_include_shift_info(
"is_override": False, "is_override": False,
"is_empty": False, "is_empty": False,
"is_gap": True, "is_gap": True,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [], "users": [],
"shift": {"pk": None}, "shift": {"pk": None},
@ -512,7 +512,7 @@ def test_final_schedule_events(
"end": start_date + timezone.timedelta(hours=start + duration), "end": start_date + timezone.timedelta(hours=start + duration),
"is_gap": is_gap, "is_gap": is_gap,
"is_override": is_override, "is_override": is_override,
"priority_level": priority, "priority_level": priority or 0,
"start": start_date + timezone.timedelta(hours=start), "start": start_date + timezone.timedelta(hours=start),
"user": user, "user": user,
"shift": ( "shift": (
@ -599,7 +599,7 @@ def test_final_schedule_override_no_priority_shift(
"calendar_type": 1 if is_override else 0, "calendar_type": 1 if is_override else 0,
"end": start_date + timezone.timedelta(hours=start + duration), "end": start_date + timezone.timedelta(hours=start + duration),
"is_override": is_override, "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), "start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
"user": user, "user": user,
} }
@ -679,7 +679,7 @@ def test_final_schedule_override_split(
"calendar_type": 1 if is_override else 0, "calendar_type": 1 if is_override else 0,
"end": start_date + timezone.timedelta(hours=start + duration), "end": start_date + timezone.timedelta(hours=start + duration),
"is_override": is_override, "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), "start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
"user": user, "user": user,
} }
@ -1051,7 +1051,7 @@ def test_preview_shift_no_user(make_organization, make_user_for_organization, ma
"is_override": False, "is_override": False,
"is_empty": True, "is_empty": True,
"is_gap": False, "is_gap": False,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [], "users": [],
"shift": {"pk": new_shift.public_primary_key}, "shift": {"pk": new_shift.public_primary_key},
@ -1130,7 +1130,7 @@ def test_preview_override_shift(make_organization, make_user_for_organization, m
"is_override": True, "is_override": True,
"is_empty": False, "is_empty": False,
"is_gap": False, "is_gap": False,
"priority_level": None, "priority_level": 0,
"missing_users": [], "missing_users": [],
"users": [ "users": [
{ {
@ -1156,7 +1156,7 @@ def test_preview_override_shift(make_organization, make_user_for_organization, m
expected_events = [ expected_events = [
{ {
"end": start_date + timezone.timedelta(hours=start + duration), "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), "start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
"user": user, "user": user,
"is_override": is_override, "is_override": is_override,