Use FreeBusy for schedule availability

backend/src/appointment/controller/apis/google_client.py

@@ -1,11 +1,15 @@
 import logging
+import os
+from datetime import datetime
 
+import sentry_sdk
 from google_auth_oauthlib.flow import Flow
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 from ...database import repo
 from ...database.models import CalendarProvider
 from ...database.schemas import CalendarConnection
+from ...defines import DATETIMEFMT
 from ...exceptions.calendar import EventNotCreatedException
 from ...exceptions.google_api import GoogleScopeChanged, GoogleInvalidCredentials
 
@@ -96,6 +100,45 @@ def list_calendars(self, token):
 
         return items
 
+    def get_free_busy(self, calendar_ids, time_min, time_max, token):
+        """Query the free busy api, we only support 1 calendar id right now
+        Ref: https://developers.google.com/calendar/api/v3/reference/freebusy/query"""
+        response = {}
+        items = []
+
+        import time
+
+        perf_start = time.perf_counter_ns()
+        with build('calendar', 'v3', credentials=token, cache_discovery=False) as service:
+            request = service.freebusy().query(
+                body=dict(timeMin=time_min, timeMax=time_max, items=[{'id': calendar_id} for calendar_id in calendar_ids])
+            )
+
+            while request is not None:
+                try:
+                    response = request.execute()
+
+                    calendar_items = [calendar.get('busy', []) for calendar in response.get('calendars', {}).values()]
+                    for busy in calendar_items:
+                        # Transform to datetimes to match caldav's behaviour
+                        items += [
+                            {
+                                'start': datetime.strptime(entry.get('start'), DATETIMEFMT),
+                                'end': datetime.strptime(entry.get('end'), DATETIMEFMT)
+                            } for entry in busy
+                        ]
+                except HttpError as e:
+                    logging.warning(f'[google_client.list_calendars] Request Error: {e.status_code}/{e.error_details}')
+
+                request = service.calendarList().list_next(request, response)
+        perf_end = time.perf_counter_ns()
+
+        # Capture the metric if sentry is enabled
+        if os.getenv('SENTRY_DSN'):
+            sentry_sdk.set_measurement('google_free_busy_time_response', perf_end - perf_start, 'nanosecond')
+
+        return items
+
     def list_events(self, calendar_id, time_min, time_max, token):
         response = {}
         items = []

backend/src/appointment/controller/calendar.py

@@ -20,7 +20,7 @@
 from datetime import datetime, timedelta, timezone, UTC
 
 from .. import utils
-from ..defines import REDIS_REMOTE_EVENTS_KEY, DATEFMT
+from ..defines import REDIS_REMOTE_EVENTS_KEY, DATEFMT, DATETIMEFMT
 from .apis.google_client import GoogleClient
 from ..database.models import CalendarProvider, BookingStatus
 from ..database import schemas, models, repo
@@ -135,6 +135,18 @@ def __init__(
         if google_tkn:
             self.google_token = Credentials.from_authorized_user_info(json.loads(google_tkn), self.google_client.SCOPES)
 
+    def get_busy_time(self, calendar_ids: list, start: str, end: str):
+        """Retrieve a list of { start, end } dicts that will indicate busy time for a user
+        Note: This does not use the remote_calendar_id from the class,
+        all calendars must be available under the google_token provided to the class"""
+        time_min = datetime.strptime(start, DATEFMT).isoformat() + 'Z'
+        time_max = datetime.strptime(end, DATEFMT).isoformat() + 'Z'
+
+        results = []
+        for calendars in utils.chunk_list(calendar_ids, chunk_by=5):
+            results += self.google_client.get_free_busy(calendars, time_min, time_max, self.google_token)
+        return results
+
     def test_connection(self) -> bool:
         """This occurs during Google OAuth login"""
         return bool(self.google_token)
@@ -281,6 +293,32 @@ def __init__(self, subscriber_id: int, calendar_id: int, redis_instance, url: st
         # connect to the CalDAV server
         self.client = DAVClient(url=url, username=user, password=password)
 
+    def get_busy_time(self, calendar_ids: list, start: str, end: str):
+        """Retrieve a list of { start, end } dicts that will indicate busy time for a user
+        Note: This does not use the remote_calendar_id from the class"""
+        time_min = datetime.strptime(start, DATEFMT)
+        time_max = datetime.strptime(end, DATEFMT)
+
+        calendar = self.client.calendar(url=calendar_ids[0])
+        response = calendar.freebusy_request(time_min, time_max)
+
+        items = []
+
+        # This is sort of dumb, freebusy object isn't exposed in the icalendar instance except through a list of tuple props
+        # Luckily the value is a vPeriod which is a tuple of date times/timedelta (0 = Start, 1 = End)
+        for prop in response.icalendar_instance.property_items():
+            if prop[0].lower() != 'freebusy':
+                continue
+
+            # Tuple of start datetime and end datetime (or timedelta!)
+            period = prop[1].dt
+            items.append({
+                'start': period[0],
+                'end': period[1] if isinstance(period[1], datetime) else period[0] + period[1]
+            })
+
+        return items
+
     def test_connection(self) -> bool:
         """Ensure the connection information is correct and the calendar connection works"""
 
@@ -616,27 +654,26 @@ def existing_events_for_schedule(
     ) -> list[schemas.Event]:
         """This helper retrieves all events existing in given calendars for the scheduled date range"""
         existing_events = []
+        google_calendars = []
+
+        now = datetime.now()
+
+        earliest_booking = now + timedelta(minutes=schedule.earliest_booking)
+        farthest_booking = now + timedelta(minutes=schedule.farthest_booking)
+
+        start = max([datetime.combine(schedule.start_date, schedule.start_time), earliest_booking])
+        end = (
+            min([datetime.combine(schedule.end_date, schedule.end_time), farthest_booking])
+            if schedule.end_date
+            else farthest_booking
+        )
 
         # handle calendar events
         for calendar in calendars:
             if calendar.provider == CalendarProvider.google:
-                external_connection = utils.list_first(
-                    repo.external_connection.get_by_type(db, subscriber.id, schemas.ExternalConnectionType.google)
-                )
-
-                if external_connection is None or external_connection.token is None:
-                    raise RemoteCalendarConnectionError()
-
-                con = GoogleConnector(
-                    db=db,
-                    redis_instance=redis,
-                    google_client=google_client,
-                    remote_calendar_id=calendar.user,
-                    calendar_id=calendar.id,
-                    subscriber_id=subscriber.id,
-                    google_tkn=external_connection.token,
-                )
+                google_calendars.append(calendar)
             else:
+                # Caldav - We don't have a smart way to batch these right now so just call them 1 by 1
                 con = CalDavConnector(
                     redis_instance=redis,
                     url=calendar.url,
@@ -646,23 +683,52 @@ def existing_events_for_schedule(
                     calendar_id=calendar.id,
                 )
 
-            now = datetime.now()
-
-            earliest_booking = now + timedelta(minutes=schedule.earliest_booking)
-            farthest_booking = now + timedelta(minutes=schedule.farthest_booking)
-
-            start = max([datetime.combine(schedule.start_date, schedule.start_time), earliest_booking])
-            end = (
-                min([datetime.combine(schedule.end_date, schedule.end_time), farthest_booking])
-                if schedule.end_date
-                else farthest_booking
+                try:
+                    existing_events.extend([
+                        schemas.Event(
+                            start=busy.get('start'),
+                            end=busy.get('end'),
+                            title='Busy'
+                        ) for busy in
+                        con.get_busy_time([calendar.url], start.strftime(DATEFMT), end.strftime(DATEFMT))
+                    ])
+
+                    # We're good here, continue along the loop
+                    continue
+                except requests.exceptions.ConnectionError:
+                    pass
+
+                # Okay maybe this server doesn't support freebusy, try the old way
+                try:
+                    existing_events.extend(con.list_events(start.strftime(DATEFMT), end.strftime(DATEFMT)))
+                except requests.exceptions.ConnectionError:
+                    # Connection error with remote caldav calendar, don't crash this route.
+                    pass
+
+        # Batch up google calendar calls since we can only have one google calendar connected
+        if len(google_calendars) > 0 and google_calendars[0].provider == CalendarProvider.google:
+            external_connection = utils.list_first(
+                repo.external_connection.get_by_type(db, subscriber.id, schemas.ExternalConnectionType.google)
             )
-
-            try:
-                existing_events.extend(con.list_events(start.strftime(DATEFMT), end.strftime(DATEFMT)))
-            except requests.exceptions.ConnectionError:
-                # Connection error with remote caldav calendar, don't crash this route.
-                pass
+            if external_connection is None or external_connection.token is None:
+                raise RemoteCalendarConnectionError()
+
+            con = GoogleConnector(
+                db=db,
+                redis_instance=redis,
+                google_client=google_client,
+                remote_calendar_id=google_calendars[0].user,  # This isn't used for get_busy_time but is still needed.
+                calendar_id=google_calendars[0].id,  # This isn't used for get_busy_time but is still needed.
+                subscriber_id=subscriber.id,
+                google_tkn=external_connection.token,
+            )
+            existing_events.extend([
+                schemas.Event(
+                    start=busy.get('start'),
+                    end=busy.get('end'),
+                    title='Busy'
+                ) for busy in con.get_busy_time([calendar.user for calendar in google_calendars], start.strftime(DATEFMT), end.strftime(DATEFMT))
+            ])
 
         # handle already requested time slots
         for slot in schedule.slots:

backend/src/appointment/defines.py

@@ -2,6 +2,7 @@
 FALLBACK_LOCALE = 'en'
 
 DATEFMT = '%Y-%m-%d'
+DATETIMEFMT = '%Y-%m-%dT%H:%M:%SZ'
 
 # list of redis keys
 REDIS_REMOTE_EVENTS_KEY = 'rmt_events'

backend/src/appointment/utils.py

@@ -1,6 +1,7 @@
 import json
 import re
 import urllib.parse
+from contextlib import contextmanager
 from urllib import parse
 
 from functools import cache
@@ -69,3 +70,9 @@ def retrieve_user_url_data(url):
 
     # Return the username and signature decoded, but ensure the clean_url is encoded.
     return urllib.parse.unquote_plus(username), urllib.parse.unquote_plus(signature), clean_url
+
+
+def chunk_list(to_chunk: list, chunk_by: int):
+    """Chunk a to_chunk list by chunk_by"""
+    for i in range(0, len(to_chunk), chunk_by):
+        yield to_chunk[i:i+chunk_by]

backend/test/integration/test_schedule.py

@@ -88,8 +88,6 @@ def test_create_schedule_with_end_time_before_start_time(
         assert data.get('detail')[0]['ctx']['err_field'] == 'end_time'
         assert data.get('detail')[0]['ctx']['err_value'] == '09:30:00'
 
-
-
     def test_create_schedule_on_unconnected_calendar(
         self, with_client, make_caldav_calendar, make_schedule, schedule_input
     ):
@@ -294,11 +292,11 @@ def __init__(self, redis_instance, url, user, password, subscriber_id, calendar_
                 pass
 
             @staticmethod
-            def list_events(self, start, end):
+            def get_busy_time(self, remote_calendar_ids, start, end):
                 return []
 
         monkeypatch.setattr(CalDavConnector, '__init__', MockCaldavConnector.__init__)
-        monkeypatch.setattr(CalDavConnector, 'list_events', MockCaldavConnector.list_events)
+        monkeypatch.setattr(CalDavConnector, 'get_busy_time', MockCaldavConnector.get_busy_time)
 
         start_date = date(2024, 3, 1)
         start_time = time(16)
@@ -409,18 +407,14 @@ def __init__(self, redis_instance, url, user, password, subscriber_id, calendar_
                 pass
 
             @staticmethod
-            def list_events(self, start, end):
+            def get_busy_time(self, calendar_ids, start, end):
                 return [
-                    schemas.Event(
-                        title='A blocker!',
-                        start=start_end_datetimes[0],
-                        end=start_end_datetimes[1],
-                    )
+                    {'start': start_end_datetimes[0], 'end': start_end_datetimes[1]}
                     for start_end_datetimes in blocker_times
                 ]
 
         monkeypatch.setattr(CalDavConnector, '__init__', MockCaldavConnector.__init__)
-        monkeypatch.setattr(CalDavConnector, 'list_events', MockCaldavConnector.list_events)
+        monkeypatch.setattr(CalDavConnector, 'get_busy_time', MockCaldavConnector.get_busy_time)
 
         subscriber = make_pro_subscriber()
         generated_calendar = make_caldav_calendar(subscriber.id, connected=True)
@@ -528,22 +522,20 @@ def test_fail_and_success(
 
         class MockCaldavConnector:
             @staticmethod
-            def list_events(self, start, end):
+            def get_busy_time(self, calendar_ids, start, end):
                 return [
-                    schemas.Event(
-                        title='A blocker!',
-                        start=start_datetime,
-                        end=datetime.combine(start_date, start_time, tzinfo=timezone.utc) + timedelta(minutes=10),
-                    ),
-                    schemas.Event(
-                        title='A second blocker!',
-                        start=start_datetime + timedelta(minutes=10),
-                        end=datetime.combine(start_date, start_time, tzinfo=timezone.utc) + timedelta(minutes=20),
-                    ),
+                    {
+                        'start': start_datetime,
+                        'end': datetime.combine(start_date, start_time, tzinfo=timezone.utc) + timedelta(minutes=10),
+                    },
+                    {
+                        'start': start_datetime + timedelta(minutes=10),
+                        'end': datetime.combine(start_date, start_time, tzinfo=timezone.utc) + timedelta(minutes=20),
+                    },
                 ]
 
         # Override the fixture's list_events
-        monkeypatch.setattr(CalDavConnector, 'list_events', MockCaldavConnector.list_events)
+        monkeypatch.setattr(CalDavConnector, 'get_busy_time', MockCaldavConnector.get_busy_time)
 
         subscriber = make_pro_subscriber()
         generated_calendar = make_caldav_calendar(subscriber.id, connected=True)
@@ -623,6 +615,14 @@ def test_success_with_no_confirmation(
         start_datetime = datetime.combine(start_date, start_time, tzinfo=timezone.utc)
         end_time = time(10)
 
+        class MockCaldavConnector:
+            @staticmethod
+            def get_busy_time(self, calendar_ids, start, end):
+                return []
+
+        # Override the fixture's list_events
+        monkeypatch.setattr(CalDavConnector, 'get_busy_time', MockCaldavConnector.get_busy_time)
+
         subscriber = make_pro_subscriber()
         generated_calendar = make_caldav_calendar(subscriber.id, connected=True)
         make_schedule(