[stable9.1] Merge pull request #25636 from owncloud/fix-birthday-calendar-component (#26056)

The birthday calendar can only hold VEVENT

Author: DeepDiver1975

apps/dav/appinfo/info.xml

@@ -22,10 +22,11 @@
 	</background-jobs>
 	<repair-steps>
 		<post-migration>
-			<job>OCA\DAV\Migration\Classification</job>
+			<step>OCA\DAV\Migration\Classification</step>
+			<step>OCA\DAV\Migration\FixBirthdayCalendarComponent</step>
 		</post-migration>
 		<live-migration>
-			<job>OCA\DAV\Migration\GenerateBirthdays</job>
+			<step>OCA\DAV\Migration\GenerateBirthdays</step>
 		</live-migration>
 	</repair-steps>
 </info>

apps/dav/lib/CalDAV/BirthdayService.php

@@ -108,6 +108,7 @@ public function ensureCalendarExists($principal) {
 		$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
 			'{DAV:}displayname' => 'Contact birthdays',
 			'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+			'components'   => 'VEVENT',
 		]);
 
 		return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);

apps/dav/lib/Migration/FixBirthdayCalendarComponent.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * @author Thomas Müller <[email protected]>
+ *
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\DAV\Migration;
+
+use OCA\DAV\CalDAV\BirthdayService;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class FixBirthdayCalendarComponent implements IRepairStep {
+
+	/** @var IDBConnection */
+	private $connection;
+
+	/**
+	 * FixBirthdayCalendarComponent constructor.
+	 *
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getName() {
+		return 'Fix component of birthday calendars';
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function run(IOutput $output) {
+		$query = $this->connection->getQueryBuilder();
+		$updated = $query->update('calendars')
+			->set('components', $query->createNamedParameter('VEVENT'))
+			->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
+			->execute();
+
+		$output->info("$updated birthday calendars updated.");
+	}
+}

apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php

@@ -178,6 +178,17 @@ public function testGetAllAffectedPrincipals() {
 		], $users);
 	}
 
+	public function testBirthdayCalendarHasComponentEvent() {
+		$this->calDav->expects($this->once())
+			->method('createCalendar')
+			->with('principal001', 'contact_birthdays', [
+				'{DAV:}displayname' => 'Contact birthdays',
+				'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+				'components'   => 'VEVENT',
+			]);
+		$this->service->ensureCalendarExists('principal001');
+	}
+
 	public function providesBirthday() {
 		return [
 			[true,