Skip to content

Commit cdb62f2

Browse files
authored
Enable final schedule exports (#1808)
Update iCal schedule and personal exports to use final schedule events.
1 parent 20ec6f5 commit cdb62f2

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2121

2222
- Update shift API to use a default interval value (`1`) when a `frequency` is set and no `interval` is given
2323
- Limit number of alertmanager alerts in alert group to autoresolve by 500 ([1779](https://github.com/grafana/oncall/pull/1779))
24+
- Update schedule and personal ical exports to use final shift events
2425

2526
## v1.2.14 (2023-04-19)
2627

engine/apps/schedules/ical_utils.py

+5-15
Original file line numberDiff line numberDiff line change
@@ -652,28 +652,18 @@ def _get_ical_data_final_schedule(schedule: OnCallSchedule) -> str:
652652

653653

654654
def ical_export_from_schedule(schedule: OnCallSchedule) -> bytes:
655-
if _is_final_export_enabled(schedule):
656-
ical_data = _get_ical_data_final_schedule(schedule)
657-
return ical_data.encode()
658-
else:
659-
calendars = schedule.get_icalendars()
660-
ical_obj = create_base_icalendar(schedule.name)
661-
get_events_from_calendars(ical_obj, calendars)
662-
return ical_obj.to_ical()
655+
ical_data = _get_ical_data_final_schedule(schedule)
656+
return ical_data.encode()
663657

664658

665659
def user_ical_export(user: User, schedules: list[OnCallSchedule]) -> bytes:
666660
schedule_name = "On-Call Schedule for {0}".format(user.username)
667661
ical_obj = create_base_icalendar(schedule_name)
668662

669663
for schedule in schedules:
670-
if _is_final_export_enabled(schedule):
671-
name = schedule.name
672-
ical_data = _get_ical_data_final_schedule(schedule)
673-
calendars = [Calendar.from_ical(ical_data)]
674-
else:
675-
name = None
676-
calendars = schedule.get_icalendars()
664+
name = schedule.name
665+
ical_data = _get_ical_data_final_schedule(schedule)
666+
calendars = [Calendar.from_ical(ical_data)]
677667
get_user_events_from_calendars(ical_obj, calendars, user, name=name)
678668

679669
return ical_obj.to_ical()

0 commit comments

Comments
 (0)