Merge pull request #8679 from nextcloud/7707_12

[stable12] generate different UIDs for Birthday, Anniversary and Death event
nextcloud · Mar 6, 2018 · 6acc307 · 6acc307
2 parents 95f067a + 8b28e91
commit 6acc307
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -125,10 +125,11 @@ public function ensureCalendarExists($principal) {
 	/**
 	 * @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;
 		}
@@ -198,7 +199,7 @@ public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
 			$date
 		);
 		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID;
+		$vEvent->{'UID'} = $doc->UID . $postfix;
 		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
 		$vEvent->{'SUMMARY'} = $summary;
 		$vEvent->{'TRANSP'} = 'TRANSPARENT';
@@ -274,7 +275,7 @@ protected function getAllAffectedPrincipals($addressBookId) {
 	 */
 	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
@@ -59,7 +59,7 @@ public function setUp() {
 	 * @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 {