fix(dav): fix event birthday alarms not being updated by tcitworld · Pull Request #39977 · nextcloud/server

tcitworld · 2023-08-19T09:47:55Z

In #33251 the default offset for a birthday event alarm was changed to 9AM on the day of the event.

However the birthdayEvenChanged method did not account for alarm changes, so it was never propagated to existing birthday events, which were kept on midnight.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||
+			($newCalendarData->VEVENT->VALARM && $existingBirthday->VEVENT->VALARM && $newCalendarData->VEVENT->VALARM->TRIGGER->getValue() !== $existingBirthday->VEVENT->VALARM->TRIGGER->getValue())


 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||
+			($newCalendarData->VEVENT->VALARM && $existingBirthday->VEVENT->VALARM && $newCalendarData->VEVENT->VALARM->TRIGGER->getValue() !== $existingBirthday->VEVENT->VALARM->TRIGGER->getValue())


 		return (
 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||


 		return (
 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||


 		return (
 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||


 		return (
 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||


 		return (
 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||


 		return (
 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||


 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||
+			($newCalendarData->VEVENT->VALARM && $existingBirthday->VEVENT->VALARM && $newCalendarData->VEVENT->VALARM->TRIGGER->getValue() !== $existingBirthday->VEVENT->VALARM->TRIGGER->getValue())


 			$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||
+			($newCalendarData->VEVENT->VALARM && $existingBirthday->VEVENT->VALARM && $newCalendarData->VEVENT->VALARM->TRIGGER->getValue() !== $existingBirthday->VEVENT->VALARM->TRIGGER->getValue())


nfebe

LGTM

tcitworld · 2023-10-02T09:38:19Z

Should we add a repair job just like RegenerateBirthdayCalendars to fix all existing events? Or just edit the app config value from regeneratedBirthdayCalendarsForYearFix to something like regeneratedBirthdayCalendarsForAlarmFix so that it's triggered again?

miaulalala · 2023-10-02T12:27:22Z

Should we add a repair job just like RegenerateBirthdayCalendars to fix all existing events? Or just edit the app config value from regeneratedBirthdayCalendarsForYearFix to something like regeneratedBirthdayCalendarsForAlarmFix so that it's triggered again?

Repair step sounds good to me.

tcitworld · 2024-02-01T17:29:55Z

Rebased

+	public function run(IOutput $output): void {
 		// only run once
-		if ($this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix') === 'yes') {
+		if ($this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix') === 'yes' && $this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForAlarmFix') === 'yes') {


+	public function run(IOutput $output): void {
 		// only run once
-		if ($this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix') === 'yes') {
+		if ($this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix') === 'yes' && $this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForAlarmFix') === 'yes') {



 		// if all were done, no need to redo the repair during next upgrade
 		$this->config->setAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix', 'yes');
+		$this->config->setAppValue('dav', 'regeneratedBirthdayCalendarsForAlarmFix', 'yes');


In #33251 the default offset for a birthday event alarm was changed to 9AM on the day of the event. However the birthdayEvenChanged method did not account for alarm changes, so it was never propagated to existing birthday events, which were kept on midnight. Signed-off-by: Thomas Citharel <tcit@tcit.fr>

…thday calendars So that birthday calendars are immediately updated and we don't need to wait for user to change a card or disable/enable the calendar. We reuse the existing RegenerateBirthdayCalendars repair step instead of adding a new one. Signed-off-by: Thomas Citharel <tcit@tcit.fr>

The trigger was only compared when both the existing and the new birthday event had an alarm, so enabling or disabling the reminder offset never updated existing events. Compare the triggers directly and mention the reminder update in the repair step name. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

tcitworld added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals feature: carddav Related to CardDAV internals labels Aug 19, 2023

tcitworld added this to the Nextcloud 28 milestone Aug 19, 2023

tcitworld requested a review from a team August 19, 2023 09:47

tcitworld requested review from ChristophWurst and miaulalala as code owners August 19, 2023 09:47

backportbot-nextcloud Bot added the backport-request label Aug 19, 2023

github-advanced-security AI found potential problems Aug 19, 2023

View reviewed changes

nfebe approved these changes Aug 19, 2023

View reviewed changes

come-nc approved these changes Aug 28, 2023

View reviewed changes

miaulalala force-pushed the dav-fix-birthday-sync branch from 03a300c to f3ccb5d Compare August 28, 2023 10:35

tcitworld force-pushed the dav-fix-birthday-sync branch from f3ccb5d to 24e6ef5 Compare October 2, 2023 09:33

tcitworld force-pushed the dav-fix-birthday-sync branch 2 times, most recently from 3ba9335 to c2c2c8b Compare October 2, 2023 15:12

miaulalala approved these changes Oct 3, 2023

View reviewed changes

blizzz force-pushed the dav-fix-birthday-sync branch from c2c2c8b to 87c8581 Compare October 11, 2023 13:33

skjnldsv mentioned this pull request Nov 1, 2023

chore: 28.0.0 beta 1 #41228

Merged

This was referenced Nov 6, 2023

28.0.0 beta 2 #41314

Merged

28.0.0 beta 3 #41379

Merged

This was referenced Nov 14, 2023

28.0.0 beta 4 #41477

Merged

28.0.0 RC1 #41621

Merged

blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023

tcitworld force-pushed the dav-fix-birthday-sync branch from 87c8581 to 4451809 Compare February 1, 2024 17:29

github-advanced-security AI found potential problems Feb 1, 2024

View reviewed changes

This was referenced Feb 11, 2026

[stable33] 33.0.0 RC4 #58257

Merged

[stable33] 33.0.0 #58364

Merged

blizzz modified the milestones: Nextcloud 33, Nextcloud 34 Feb 16, 2026

DorraJaouad requested a review from SebastianKrupinski as a code owner April 23, 2026 09:41

nextcloud-bot mentioned this pull request May 27, 2026

[stable34] 34.0.0 RC3 #60771

Merged

nextcloud-bot mentioned this pull request Jun 4, 2026

[stable34] 34.0.0rc4 #60979

Closed

skjnldsv mentioned this pull request Jun 4, 2026

[stable34] build(hub): 34.0.0rc4 #60980

Merged

This was referenced Jun 5, 2026

[stable34] 34.0.0 RC5 #61000

Merged

[stable34] 34.0.0 #61060

Merged

nextcloud-bot modified the milestones: Nextcloud 34, Nextcloud 34.0.1 Jun 8, 2026

susnux added the community pull requests from community label Jun 9, 2026

susnux removed this from the Nextcloud 34.0.1 milestone Jun 9, 2026

nextcloud deleted a comment from tcitworld Nov 6, 2026

tcitworld added 2 commits November 6, 2026 23:29

nextcloud deleted a comment from tcitworld Nov 6, 2026

susnux force-pushed the dav-fix-birthday-sync branch from 4451809 to df6ecfb Compare November 6, 2026 22:45

susnux requested a review from hamza221 as a code owner November 6, 2026 22:45

nextcloud-command added the AI assisted label Nov 6, 2026

susnux added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 6, 2026

SebastianKrupinski approved these changes Nov 6, 2026

View reviewed changes

susnux merged commit 9b1f8ae into master Nov 6, 2026
164 of 168 checks passed

susnux deleted the dav-fix-birthday-sync branch November 6, 2026 23:13

susnux linked an issue Nov 6, 2026 that may be closed by this pull request

Birthday event alert should happen in the morning, not at midnight #28747

Closed

Navigation Menu

Repository navigation

fix(dav): fix event birthday alarms not being updated - #39977

fix(dav): fix event birthday alarms not being updated#39977
susnux merged 3 commits into
masterfrom
dav-fix-birthday-sync

tcitworld commented Aug 19, 2023

Uh oh!

Check failure

Check failure

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

nfebe left a comment

Uh oh!

tcitworld commented Oct 2, 2023

Uh oh!

miaulalala commented Oct 2, 2023

Uh oh!

tcitworld commented Feb 1, 2024

Uh oh!

Check notice

Check notice

Check notice

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Conversation

tcitworld commented Aug 19, 2023

Checklist

Uh oh!

Check failure

Check failure

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

nfebe left a comment

Choose a reason for hiding this comment

Uh oh!

tcitworld commented Oct 2, 2023

Uh oh!

miaulalala commented Oct 2, 2023

Uh oh!

tcitworld commented Feb 1, 2024

Uh oh!

Check notice

Check notice

Check notice

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants