From e63155bfbdda2f8461d9d107de9e3860cf8172d0 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Fri, 26 May 2017 11:08:10 +0100
Subject: [PATCH] [stable10] Add migration step to fix birthday claendars

---
 .../Migrations/Version20170526100342.php}     | 44 ++++++-------------
 apps/dav/appinfo/info.xml                     |  7 +--
 2 files changed, 14 insertions(+), 37 deletions(-)
 rename apps/dav/{lib/Migration/FixBirthdayCalendarComponent.php => appinfo/Migrations/Version20170526100342.php} (52%)

diff --git a/apps/dav/lib/Migration/FixBirthdayCalendarComponent.php b/apps/dav/appinfo/Migrations/Version20170526100342.php
similarity index 52%
rename from apps/dav/lib/Migration/FixBirthdayCalendarComponent.php
rename to apps/dav/appinfo/Migrations/Version20170526100342.php
index 63b36244f196..9e05925c8cab 100644
--- a/apps/dav/lib/Migration/FixBirthdayCalendarComponent.php
+++ b/apps/dav/appinfo/Migrations/Version20170526100342.php
@@ -19,44 +19,26 @@
  *
  */
 
-namespace OCA\DAV\Migration;
+namespace OCA\DAV\Migrations;
 
-use OCA\DAV\CalDAV\BirthdayService;
-use OCP\IDBConnection;
 use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
+use OCP\Migration\ISimpleMigration;
 
-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';
-	}
+/**
+ * Fix the calendar components of the system contact birthday calendar
+ */
+class Version20170526100342 implements ISimpleMigration {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$query = $this->connection->getQueryBuilder();
+	public function run(IOutput $out) {
+		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$updated = $query->update('calendars')
 			->set('components', $query->createNamedParameter('VEVENT'))
-			->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
+			->set('calendarorder', $query->createNamedParameter('100'))
+			->where($query->expr()->eq(
+				'uri',
+				$query->createNamedParameter('contact_birthdays')))
 			->execute();
 
-		$output->info("$updated birthday calendars updated.");
+		$out->info("$updated birthday calendars updated.");
 	}
 }
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 54ca54e832b3..5da36c361a92 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>ownCloud WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
-	<version>0.2.9</version>
+	<version>0.3.0</version>
 	<default_enable/>
 	<use-migrations>true</use-migrations>
 	<types>
@@ -21,11 +21,6 @@
 	<background-jobs>
 		<job>OCA\DAV\CardDAV\SyncJob</job>
 	</background-jobs>
-	<repair-steps>
-		<post-migration>
-			<step>OCA\DAV\Migration\FixBirthdayCalendarComponent</step>
-		</post-migration>
-	</repair-steps>
 	<commands>
 		<command>OCA\DAV\Command\CreateAddressBook</command>
 		<command>OCA\DAV\Command\CreateCalendar</command>