From 0eb6cda2ff15f963f632b9b2749d23711542741c Mon Sep 17 00:00:00 2001 From: SebastianKrupinski Date: Tue, 30 Jul 2024 13:07:14 -0400 Subject: [PATCH] fix(caldav): fixed initial sync and double processing Signed-off-by: SebastianKrupinski --- apps/dav/lib/CalDAV/CalDavBackend.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 6d0c53e403cca..8fff6902f9a54 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -2420,12 +2420,10 @@ public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limi if ($initialSync) { $qb = $this->db->getQueryBuilder(); $qb->select('uri') - ->from('calendarchanges') + ->from('calendarobjects') ->where($qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId))) ->andWhere($qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))) - ->groupBy('uri') - // forced (PARAM_INT) is needed for doctrine with Sqlite, for the value to be used as an integer without quotes - ->having($qb->expr()->lt($qb->func()->max('operation'), $qb->createNamedParameter(3, $qb::PARAM_INT))); + ->andWhere($qb->expr()->isNull('deleted_at')); } else { $qb = $this->db->getQueryBuilder(); $qb->select('uri', $qb->func()->max('operation'))