Add better support for syncing recurring caldav events

Author: alextselegidis

application/controllers/Caldav.php

@@ -132,9 +132,13 @@ public static function sync(string $provider_id): void
 
         $sync_future_days = $provider['settings']['sync_future_days'];
 
-        $start_date_time = date('Y-m-d H:i:s', strtotime('-' . $sync_past_days . ' days'));
+        $start_date_time_object = new DateTime('-' . $sync_past_days . ' days');
+        $start_date_time_object->setTime(0, 0);
+        $start_date_time = $start_date_time_object->format('Y-m-d H:i:s');
 
-        $end_date_time = date('Y-m-d H:i:s', strtotime('+' . $sync_future_days . ' days'));
+        $end_date_time_object = new DateTime('+' . $sync_future_days . ' days');
+        $end_date_time_object->setTime(23, 59, 59);
+        $end_date_time = $end_date_time_object->format('Y-m-d H:i:s');
 
         $where = [
             'start_datetime >=' => $start_date_time,
@@ -253,6 +257,24 @@ public static function sync(string $provider_id): void
                 continue;
             }
 
+            $matching_unavailability = $CI->unavailabilities_model
+                ->query()
+                ->where([
+                    'start_datetime' => $caldav_event['start_datetime'],
+                    'end_datetime' => $caldav_event['end_datetime'],
+                    'notes' => $caldav_event['summary'] . ' ' . $caldav_event['description'],
+                    'id_users_provider' => $provider_id,
+                ])
+                ->get()
+                ->row_array();
+
+            if ($matching_unavailability) {
+                // Update the ID of the matching unavailability record.
+                $matching_unavailability['id_caldav_calendar'] = $caldav_event['id'];
+                $CI->unavailabilities_model->save($matching_unavailability);
+                continue;
+            }
+
             // Record doesn't exist in the Easy!Appointments, so add the event now.
 
             $local_event = [

application/libraries/Caldav_sync.php

@@ -524,7 +524,7 @@ private function convert_caldav_event_to_array_event(VEvent $vevent, DateTimeZon
             $event_id = (string) $vevent->UID;
 
             if ($is_recurring_event) {
-                $event_id .= '-RECURRENCE-' . random_string();
+                $event_id .= '-RECURRENCE-' . $caldav_start_date_time;
             }
 
             // Return the converted event

application/models/Appointments_model.php

@@ -352,7 +352,8 @@ public function delete_caldav_recurring_events(string $start_date_time, string $
         $this->db
             ->where('start_datetime >=', $start_date_time)
             ->where('end_datetime <=', $end_date_time)
-            ->like('id_caldav_calendar', '%RECURRENCE%')
+            ->where('is_unavailability', true)
+            ->like('id_caldav_calendar', 'RECURRENCE')
             ->delete('appointments');
     }