From 1b8fc260c6f06ddeb948f55a2985a20fb9149c3d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Thu, 4 Jan 2018 20:15:24 +0100
Subject: [PATCH] generate different UIDs for Birthday, Anniversary and Death
 event

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
---
 apps/dav/lib/CalDAV/BirthdayService.php             | 7 ++++---
 apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
index 62d218f0a2..0f6e819bcc 100644
--- a/apps/dav/lib/CalDAV/BirthdayService.php
+++ b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -148,10 +148,11 @@ class BirthdayService {
 	/**
 	 * @param string $cardData
 	 * @param string $dateField
+	 * @param string $postfix
 	 * @param string $summarySymbol
 	 * @return null|VCalendar
 	 */
-	public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
+	public function buildDateFromContact($cardData, $dateField, $postfix, $summarySymbol) {
 		if (empty($cardData)) {
 			return null;
 		}
@@ -221,7 +222,7 @@ class BirthdayService {
 			$date
 		);
 		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID;
+		$vEvent->{'UID'} = $doc->UID . $postfix;
 		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
 		$vEvent->{'SUMMARY'} = $summary;
 		$vEvent->{'TRANSP'} = 'TRANSPARENT';
@@ -297,7 +298,7 @@ class BirthdayService {
 	 */
 	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
 		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
-		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
+		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix'], $type['symbol']);
 		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
 		if (is_null($calendarData)) {
 			if (!is_null($existing)) {
diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
index 867168033a..739b81ddf0 100644
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -64,7 +64,7 @@ class BirthdayServiceTest extends TestCase {
 	 * @param string | null $data
 	 */
 	public function testBuildBirthdayFromContact($expectedSummary, $data) {
-		$cal = $this->service->buildDateFromContact($data, 'BDAY', '*');
+		$cal = $this->service->buildDateFromContact($data, 'BDAY', '', '*');
 		if ($expectedSummary === null) {
 			$this->assertNull($cal);
 		} else {