fixup! Fix/handle-duplicate-reminder

Signed-off-by: hamza mahjoubi <hamzamahjoubi221@gmail.com>
nextcloud · Dec 13, 2023 · ecdd4e7 · ecdd4e7
1 parent 94b61e9
commit ecdd4e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php
@@ -64,7 +64,7 @@ public function __construct(IDBConnection $db,
 	 */
 	public function getRemindersToProcess():array {
 		$query = $this->db->getQueryBuilder();
-		$query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri'])
+		$query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri','cr.notification_date', 'cr.event_hash'])
 			->from('calendar_reminders', 'cr')
 			->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
 			->join('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))

diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -468,15 +468,13 @@ private function getRemindersForVAlarm(VAlarm $valarm,
 	 */
 	private function writeRemindersToDatabase(array $reminders): void {
 		$uniqueReminders = [];
-		$seen = [];
 		foreach ($reminders as $reminder) {
 			$key = $reminder['notification_date']. $reminder['event_hash'];
-			if(!isset($seen[$key])) {
-				$seen[$key] = true;
-				$uniqueReminders[] = $reminder;
+			if(!isset($uniqueReminders[$key])) {
+				$uniqueReminders[$key] = $reminder;
 			}
 		}
-		foreach ($reminders as $uniqueReminders) {
+		foreach (array_values($uniqueReminders) as $reminder) {
 			$this->backend->insertReminder(
 				(int) $reminder['calendar_id'],
 				(int) $reminder['object_id'],