From 44f8bd51358c6c33e9fbe2425dbdf6f674503ba7 Mon Sep 17 00:00:00 2001
From: bertrandda <bertrandda@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:33:25 +0100
Subject: [PATCH 1/2] Fix caldav update if sync is set

---
 .../caldav/lib/calendar/calendar.syncUserCalendars.js        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js b/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js
index 577ebb864a..e7f7ece7fb 100644
--- a/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js
+++ b/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js
@@ -53,7 +53,10 @@ async function syncUserCalendars(userId) {
 
       // Else update it if sync is enable on calendar & events change
       if (gladysCalendar[0].sync && formatedCalendar.ctag !== gladysCalendar[0].ctag) {
-        await this.gladys.calendar.update(gladysCalendar[0].selector, formatedCalendar);
+        await this.gladys.calendar.update(gladysCalendar[0].selector, {
+          ...formatedCalendar,
+          sync: gladysCalendar[0].sync,
+        });
         return gladysCalendar[0];
       }
       return null;

From 4753a0c6e46e4977324df5b6435bc90c4cf223cb Mon Sep 17 00:00:00 2001
From: bertrandda <bertrandda@users.noreply.github.com>
Date: Sun, 5 Feb 2023 21:21:45 +0100
Subject: [PATCH 2/2] Delete sync

---
 .../caldav/lib/calendar/calendar.syncUserCalendars.js       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js b/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js
index e7f7ece7fb..664e87c039 100644
--- a/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js
+++ b/server/services/caldav/lib/calendar/calendar.syncUserCalendars.js
@@ -53,10 +53,8 @@ async function syncUserCalendars(userId) {
 
       // Else update it if sync is enable on calendar & events change
       if (gladysCalendar[0].sync && formatedCalendar.ctag !== gladysCalendar[0].ctag) {
-        await this.gladys.calendar.update(gladysCalendar[0].selector, {
-          ...formatedCalendar,
-          sync: gladysCalendar[0].sync,
-        });
+        delete formatedCalendar.sync;
+        await this.gladys.calendar.update(gladysCalendar[0].selector, formatedCalendar);
         return gladysCalendar[0];
       }
       return null;