Fix/handle-duplicate-reminder

Signed-off-by: hamza221 <hamzamahjoubi221@gmail.com>
nextcloud · Aug 1, 2024 · 2df2fb3 · 2df2fb3
1 parent 6a0edef
commit 2df2fb3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php
@@ -44,11 +44,12 @@ 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'))
-			->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'));
+			->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'))
+			->groupBy('cr.event_hash', 'cr.notification_date');
 		$stmt = $query->execute();
 
 		return array_map(

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

diff --git a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
@@ -114,9 +114,8 @@ public function testGetRemindersToProcess(): void {
 
 		$rows = $this->reminderBackend->getRemindersToProcess();
 
-		$this->assertCount(2, $rows);
+		$this->assertCount(1, $rows);
 		unset($rows[0]['id']);
-		unset($rows[1]['id']);
 
 		$this->assertEquals($rows[0], [
 			'calendar_id' => 1,
@@ -135,25 +134,7 @@ public function testGetRemindersToProcess(): void {
 			'displayname' => 'Displayname 123',
 			'principaluri' => 'principals/users/user001',
 		]);
-		$this->assertEquals($rows[1], [
-			'calendar_id' => 1,
-			'object_id' => 1,
-			'uid' => 'asd',
-			'is_recurring' => false,
-			'recurrence_id' => 123458,
-			'is_recurrence_exception' => false,
-			'event_hash' => 'asd123',
-			'alarm_hash' => 'asd567',
-			'type' => 'AUDIO',
-			'is_relative' => true,
-			'notification_date' => 123456,
-			'is_repeat_based' => false,
-			'calendardata' => 'Calendar data 123',
-			'displayname' => 'Displayname 123',
-			'principaluri' => 'principals/users/user001',
-		]);
 	}
-
 	public function testGetAllScheduledRemindersForEvent(): void {
 		$rows = $this->reminderBackend->getAllScheduledRemindersForEvent(1);