CalendarRepetableEvent refactor