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

is_icals_equal fixes (#510)

Browse source 
* is_icals_equal fixes

* treat None SEQUENCE as equal
This commit is contained in:
Innokentii Konstantinov 2022-09-08 16:11:03 +05:00 • committed by GitHub
parent 84bcbb375f
commit d8365db8f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/apps/alerts/tasks/notify_ical_schedule_shift.py
View file

@ -255,7 +255,7 @@ def notify_ical_schedule_shift(schedule_pk):
for prev_ical_file, current_ical_file in prev_and_current_ical_files:
if prev_ical_file is not None and (
current_ical_file is None or not is_icals_equal(current_ical_file, prev_ical_file, schedule)
current_ical_file is None or not is_icals_equal(current_ical_file, prev_ical_file)
):
# If icals are not equal then compare current_events from them
is_prev_ical_diff = True

36
engine/apps/schedules/ical_utils.py
View file

@ -423,28 +423,32 @@ def is_icals_equal_line_by_line(first, second):
return True
def is_icals_equal(first, second, schedule):
from apps.schedules.models import OnCallScheduleICal # noqa
if isinstance(schedule, OnCallScheduleICal):
first_cal = Calendar.from_ical(first)
def is_icals_equal(first, second):
first_cal = Calendar.from_ical(first)
if first_cal.get("PRODID", None) in ("-//My calendar product//amixr//", "-//web schedule//oncall//"):
# Compare schedules generated by oncall line by line, since they not support SEQUENCE field yet.
# But we are sure that same calendars will have same lines, since we are generating it.
return is_icals_equal_line_by_line(first, second)
else:
# Compare external calendars by events, since sometimes they contain different lines even for equal calendars.
second_cal = Calendar.from_ical(second)
first_subcomponents = first_cal.subcomponents
second_subcomponents = second_cal.subcomponents
if len(first_subcomponents) != len(second_subcomponents):
return False
for idx, first_cmp in enumerate(first_cal.subcomponents):
second_cmp = second_subcomponents[idx]
if first_cmp.name == second_cmp.name == "VEVENT":
first_uid, first_seq = first_cmp.get("UID", None), first_cmp.get("SEQUENCE", None)
second_uid, second_seq = second_cmp.get("UID", None), second_cmp.get("SEQUENCE", None)
if first_uid != second_uid:
return False
elif first_seq != second_seq:
return False
first_cal_events = {}
second_cal_events = {}
for cmp in first_cal.subcomponents:
first_cal_events[cmp.get("UID", None)] = cmp.get("SEQUENCE", None)
for cmp in second_cal.subcomponents:
second_cal_events[cmp.get("UID", None)] = cmp.get("SEQUENCE", None)
for first_uid, first_seq in first_cal_events.items():
if first_uid not in second_cal_events:
return False
second_seq = second_cal_events.get(first_uid, None)
if first_seq != second_seq:
return False
return True
else:
return is_icals_equal_line_by_line(first, second)
def ical_date_to_datetime(date, tz, start):

6
engine/apps/schedules/tasks/refresh_ical_files.py
View file

@ -47,7 +47,8 @@ def refresh_ical_file(schedule_pk):
task_logger.info(f"run_task_primary {schedule_pk} {run_task_primary} prev_ical_file_primary is None")
else:
run_task_primary = not is_icals_equal(
schedule.cached_ical_file_primary, schedule.prev_ical_file_primary, schedule
schedule.cached_ical_file_primary,
schedule.prev_ical_file_primary,
)
task_logger.info(f"run_task_primary {schedule_pk} {run_task_primary} icals not equal")
run_task_overrides = False
@ -57,7 +58,8 @@ def refresh_ical_file(schedule_pk):
task_logger.info(f"run_task_overrides {schedule_pk} {run_task_primary} prev_ical_file_overrides is None")
else:
run_task_overrides = not is_icals_equal(
schedule.cached_ical_file_overrides, schedule.prev_ical_file_overrides, schedule
schedule.cached_ical_file_overrides,
schedule.prev_ical_file_overrides,
)
task_logger.info(f"run_task_overrides {schedule_pk} {run_task_primary} icals not equal")
run_task = run_task_primary or run_task_overrides