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

Update shift preview to reuse shift PK when previewing update

Browse source
This commit is contained in:
Matias Bordese 2022-08-19 15:45:52 -03:00
parent 2365506b96
commit 18fd3a4f71
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1467,9 +1467,25 @@ def test_on_call_shift_preview_update(
# check rotation events
rotation_events = response.json()["rotation"]
# previewing an update reuses shift PK, so rotation keeps original event too
expected_rotation_events = [
{
"calendar_type": OnCallSchedule.TYPE_ICAL_PRIMARY,
"shift": {"pk": on_call_shift.public_primary_key},
"start": on_call_shift.start.strftime("%Y-%m-%dT%H:%M:%SZ"),
"end": (on_call_shift.start + timezone.timedelta(hours=1)).strftime("%Y-%m-%dT%H:%M:%SZ"),
"all_day": False,
"is_override": False,
"is_empty": False,
"is_gap": False,
"priority_level": 1,
"missing_users": [],
"users": [{"display_name": user.username, "pk": user.public_primary_key}],
"source": "api",
},
{
"calendar_type": OnCallSchedule.TYPE_ICAL_PRIMARY,
"shift": {"pk": on_call_shift.public_primary_key},
"start": shift_start,
"end": shift_end,
"all_day": False,
@ -1480,10 +1496,8 @@ def test_on_call_shift_preview_update(
"missing_users": [],
"users": [{"display_name": other_user.username, "pk": other_user.public_primary_key}],
"source": "web",
}
},
]
# there isn't a saved shift, we don't care/know the temp pk
_ = [r.pop("shift") for r in rotation_events]
assert rotation_events == expected_rotation_events
# check final schedule events

3
engine/apps/api/views/on_call_shifts.py
View file

@ -90,6 +90,9 @@ class OnCallShiftView(PublicPrimaryKeyMixin, UpdateSerializerMixin, ModelViewSet
validated_data = serializer._correct_validated_data(
serializer.validated_data["type"], serializer.validated_data
)
if not validated_data.get("rolling_users"):
return Response(data=serializer.errors, status=status.HTTP_400_BAD_REQUEST)
updated_shift_pk = self.request.data.get("shift_pk")
shift = CustomOnCallShift(**validated_data)
schedule = shift.schedule

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

@ -631,9 +631,11 @@ class OnCallScheduleWeb(OnCallSchedule):
except CustomOnCallShift.DoesNotExist:
pass
else:
update_shift.until = custom_shift.rotation_start
if update_shift.event_is_started:
update_shift.until = custom_shift.rotation_start
extra_shifts.append(update_shift)
custom_shift.public_primary_key = updated_shift_pk
qs = qs.exclude(public_primary_key=updated_shift_pk)
extra_shifts.append(update_shift)
ical_file = self._generate_ical_file_from_shifts(qs, extra_shifts=extra_shifts)