3 files changed, 36 insertions, 0 deletions

diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php
index d8cf2a34115..07905db7368 100644
--- a/apps/dav/appinfo/application.php
+++ b/apps/dav/appinfo/application.php
@@ -24,9 +24,12 @@ use OCA\DAV\CardDAV\ContactsManager;
 use OCA\DAV\CardDAV\SyncJob;
 use OCA\DAV\CardDAV\SyncService;
 use OCA\DAV\HookManager;
+use OCA\Dav\Migration\AddressBookAdapter;
+use OCA\Dav\Migration\MigrateAddressbooks;
 use \OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
 use OCP\Contacts\IManager;
+use OCP\IUser;
 
 class Application extends App {
 
@@ -73,6 +76,14 @@ class Application extends App {
 			return new \OCA\DAV\CardDAV\CardDavBackend($db, $principal, $logger);
 		});
 
+		$container->registerService('MigrateAddressbooks', function($c) {
+			/** @var IAppContainer $c */
+			$db = $c->getServer()->getDatabaseConnection();
+			return new MigrateAddressbooks(
+				new AddressBookAdapter($db),
+				$c->query('CardDavBackend')
+			);
+		});
 	}
 
 	/**
@@ -100,4 +111,20 @@ class Application extends App {
 		$jl->add(new SyncJob());
 	}
 
+	public function migrateAddressbooks() {
+
+		try {
+			$migration = $this->getContainer()->query('MigrateAddressbooks');
+			$migration->setup();
+			$userManager = $this->getContainer()->getServer()->getUserManager();
+
+			$userManager->callForAllUsers(function($user) use($migration) {
+				/** @var IUser $user */
+				$migration->migrateForUser($user->getUID());
+			});
+		} catch (\Exception $ex) {
+			$this->getContainer()->getServer()->getLogger()->logException($ex);
+		}
+	}
+
 }
diff --git a/apps/dav/appinfo/install.php b/apps/dav/appinfo/install.php
index aaa36052cd2..f6ef533958e 100644
--- a/apps/dav/appinfo/install.php
+++ b/apps/dav/appinfo/install.php
@@ -23,3 +23,4 @@ use OCA\Dav\AppInfo\Application;
 
 $app = new Application();
 $app->setupCron();
+$app->migrateAddressbooks();
diff --git a/apps/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php
index 8ef1979aa08..e8fea5daf23 100644
--- a/apps/dav/appinfo/register_command.php
+++ b/apps/dav/appinfo/register_command.php
@@ -22,6 +22,7 @@
 use OCA\Dav\AppInfo\Application;
 use OCA\DAV\Command\CreateAddressBook;
 use OCA\DAV\Command\CreateCalendar;
+use OCA\Dav\Command\MigrateAddressbooks;
 use OCA\DAV\Command\SyncSystemAddressBook;
 
 $config = \OC::$server->getConfig();
@@ -37,3 +38,10 @@ $app = new Application();
 $application->add(new CreateAddressBook($userManager, $groupManager, $dbConnection, $logger));
 $application->add(new CreateCalendar($userManager, $dbConnection));
 $application->add(new SyncSystemAddressBook($app->getSyncService()));
+
+// the occ tool is *for now* only available in debug mode for developers to test
+if ($config->getSystemValue('debug', false)){
+	$app = new \OCA\Dav\AppInfo\Application();
+	$migration = $app->getContainer()->query('MigrateAddressbooks');
+	$application->add(new MigrateAddressbooks($userManager, $migration));
+}