From 23aa016513d3759a6246a9fdda786dc88d20d6bd Mon Sep 17 00:00:00 2001 From: Ana Rute Mendes Date: Tue, 7 May 2024 13:34:18 +0200 Subject: [PATCH 1/2] Decrease period to sync We don't need to sync events that are in the past, so sync only from one month ago onwards. --- model/facade/action/SyncCalendarAction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/facade/action/SyncCalendarAction.php b/model/facade/action/SyncCalendarAction.php index c0200e413..9ede918ec 100644 --- a/model/facade/action/SyncCalendarAction.php +++ b/model/facade/action/SyncCalendarAction.php @@ -59,7 +59,7 @@ protected function doExecute() $nextYear = date("Y") + 1; - $startSyncPeriod = gmdate("Ymd\THis\Z", date(strtotime("-3 months"))); + $startSyncPeriod = gmdate("Ymd\THis\Z", date(strtotime("-1 months"))); $endSyncPeriod = gmdate("Ymd\THis\Z", strtotime($nextYear . "-12-31")); $currentEvents = $client->getEvents($startSyncPeriod, $endSyncPeriod); foreach ($currentEvents as $event) { From 485b2bdec1230c845d88dee274b4f2e8d535c19e Mon Sep 17 00:00:00 2001 From: Ana Rute Mendes Date: Tue, 7 May 2024 13:34:54 +0200 Subject: [PATCH 2/2] Convert string to date before comparing It was generating bad false positives --- model/facade/action/SyncCalendarAction.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/model/facade/action/SyncCalendarAction.php b/model/facade/action/SyncCalendarAction.php index 9ede918ec..75230f027 100644 --- a/model/facade/action/SyncCalendarAction.php +++ b/model/facade/action/SyncCalendarAction.php @@ -69,7 +69,8 @@ protected function doExecute() } foreach ($this->datesRanges as $range) { - if (!is_array($range) || !isset($range['start']) || $range['start'] < $startSyncPeriod) continue; + if (!is_array($range) || !isset($range['start']) || gmdate("Ymd\THis\Z", strtotime($range['start'])) < $startSyncPeriod) + continue; $start = str_replace("-", "", $range['start']); $end = str_replace("-", "", $range['end']);