Handle errors raised by core CalendarEvent

Also sort all day events as expected by core - https://developers.home-assistant.io/blog/2023/03/28/calendar_best_practices/

custom_components/o365/calendar.py

@@ -21,6 +21,7 @@
     is_offset_reached,
 )
 from homeassistant.const import CONF_NAME
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform, entity_registry
 from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.util import dt
@@ -75,7 +76,10 @@
     check_file_location,
     clean_html,
     format_event_data,
+    get_end_date,
+    get_hass_date,
     get_permissions,
+    get_start_date,
     load_yaml_file,
     update_calendar_file,
     validate_minimum_permission,
@@ -533,6 +537,7 @@ def __init__(
         self._exclude = exclude
         self.event = None
         self._entity_id = entity_id
+        self._error = False
 
     async def _async_get_calendar(self, hass):
         self.calendar = await hass.async_add_executor_job(
@@ -611,21 +616,26 @@ async def async_get_events(self, hass, start_date, end_date):
         if not results:
             return
         vevent_list = list(results)
-        vevent_list.sort(key=attrgetter("start"))
         event_list = []
         for vevent in vevent_list:
-            event = CalendarEvent(
-                self.get_hass_date(vevent.start, vevent.is_all_day),
-                self.get_hass_date(self.get_end_date(vevent), vevent.is_all_day),
-                vevent.subject,
-                clean_html(vevent.body),
-                vevent.location["displayName"],
-                uid=vevent.object_id,
-            )
-            if vevent.series_master_id:
-                event.recurrence_id = vevent.series_master_id
-            event_list.append(event)
+            try:
+                event = CalendarEvent(
+                    get_hass_date(vevent.start, vevent.is_all_day),
+                    get_hass_date(get_end_date(vevent), vevent.is_all_day),
+                    vevent.subject,
+                    clean_html(vevent.body),
+                    vevent.location["displayName"],
+                    uid=vevent.object_id,
+                )
+                if vevent.series_master_id:
+                    event.recurrence_id = vevent.series_master_id
+                event_list.append(event)
+            except HomeAssistantError as err:
+                _LOGGER.warning(
+                    "Invalid event found - Error: %s, Event: %s", err, vevent
+                )
 
+        event_list.sort(key=attrgetter("start"))
         return event_list
 
     async def async_update(self, hass):
@@ -653,13 +663,21 @@ async def async_update(self, hass):
             self.event = None
             return
 
-        self.event = CalendarEvent(
-            self.get_hass_date(vevent.start, vevent.is_all_day),
-            self.get_hass_date(self.get_end_date(vevent), vevent.is_all_day),
-            vevent.subject,
-            clean_html(vevent.body),
-            vevent.location["displayName"],
-        )
+        try:
+            self.event = CalendarEvent(
+                get_hass_date(vevent.start, vevent.is_all_day),
+                get_hass_date(get_end_date(vevent), vevent.is_all_day),
+                vevent.subject,
+                clean_html(vevent.body),
+                vevent.location["displayName"],
+            )
+            self._error = False
+        except HomeAssistantError as err:
+            if not self._error:
+                _LOGGER.warning(
+                    "Invalid event found - Error: %s, Event: %s", err, vevent
+                )
+                self._error = True
 
     def _get_root_event(self, results):
         started_event = None
@@ -699,21 +717,12 @@ def is_all_day(vevent):
     @staticmethod
     def is_started(vevent):
         """Is it over."""
-        return dt.utcnow() >= O365CalendarData.to_datetime(
-            O365CalendarData.get_start_date(vevent)
-        )
+        return dt.utcnow() >= O365CalendarData.to_datetime(get_start_date(vevent))
 
     @staticmethod
     def is_finished(vevent):
         """Is it over."""
-        return dt.utcnow() >= O365CalendarData.to_datetime(
-            O365CalendarData.get_end_date(vevent)
-        )
-
-    @staticmethod
-    def get_hass_date(obj, is_all_day):
-        """Get the date."""
-        return obj if isinstance(obj, datetime) and not is_all_day else obj.date()
+        return dt.utcnow() >= O365CalendarData.to_datetime(get_end_date(vevent))
 
     @staticmethod
     def to_datetime(obj):
@@ -734,22 +743,6 @@ def to_datetime(obj):
             date_obj = dt.as_local(dt.parse_datetime(obj["dateTime"]))
         return dt.as_utc(date_obj)
 
-    @staticmethod
-    def get_end_date(obj):
-        """Get the end date."""
-        if hasattr(obj, "end"):
-            return obj.end
-
-        if hasattr(obj, "duration"):
-            return obj.start + obj.duration.value
-
-        return obj.start + timedelta(days=1)
-
-    @staticmethod
-    def get_start_date(obj):
-        """Get the start date."""
-        return obj.start
-
 
 class CalendarServices:
     """Calendar Services."""

custom_components/o365/schema.py

@@ -10,11 +10,9 @@
 )
 from homeassistant.const import CONF_ENABLED, CONF_NAME
 
-from O365.calendar import (
-    AttendeeType,  # pylint: disable=no-name-in-module
-    EventSensitivity,  # pylint: disable=no-name-in-module
-    EventShowAs,  # pylint: disable=no-name-in-module
-)
+from O365.calendar import AttendeeType  # pylint: disable=no-name-in-module
+from O365.calendar import EventSensitivity  # pylint: disable=no-name-in-module
+from O365.calendar import EventShowAs  # pylint: disable=no-name-in-module
 from O365.mailbox import ExternalAudience  # pylint: disable=no-name-in-module
 from O365.utils import ImportanceLevel  # pylint: disable=no-name-in-module
 

custom_components/o365/utils.py

@@ -4,13 +4,14 @@
 import os
 import shutil
 import zipfile
-from datetime import datetime
+from datetime import datetime, timedelta
 from pathlib import Path
 
 import yaml
 from bs4 import BeautifulSoup
 from homeassistant.const import CONF_ENABLED, CONF_NAME
 from homeassistant.helpers.network import get_url
+from homeassistant.util import dt
 from voluptuous.error import Error as VoluptuousError
 
 from O365.calendar import Attendee  # pylint: disable=no-name-in-module)
@@ -273,8 +274,8 @@ def format_event_data(event):
     """Format the event data."""
     return {
         "summary": event.subject,
-        "start": event.start,
-        "end": event.end,
+        "start": get_hass_date(event.start, event.is_all_day),
+        "end": get_hass_date(get_end_date(event), event.is_all_day),
         "all_day": event.is_all_day,
         "description": clean_html(event.body),
         "location": event.location["displayName"],
@@ -289,6 +290,31 @@ def format_event_data(event):
     }
 
 
+def get_hass_date(obj, is_all_day):
+    """Get the date."""
+    if isinstance(obj, datetime) and not is_all_day:
+        return obj
+    else:
+        return dt.as_utc(dt.start_of_local_day(obj))
+    # return obj if isinstance(obj, datetime) and not is_all_day else obj.date()
+
+
+def get_end_date(obj):
+    """Get the end date."""
+    if hasattr(obj, "end"):
+        return obj.end
+
+    if hasattr(obj, "duration"):
+        return obj.start + obj.duration.value
+
+    return obj.start + timedelta(days=1)
+
+
+def get_start_date(obj):
+    """Get the start date."""
+    return obj.start
+
+
 def add_call_data_to_event(
     event,
     subject,