Merge pull request #30963 from nextcloud/feat/calendar-migration

Author: Pytal

apps/dav/composer/composer/autoload_classmap.php

@@ -299,4 +299,7 @@
     'OCA\\DAV\\Upload\\UploadFile' => $baseDir . '/../lib/Upload/UploadFile.php',
     'OCA\\DAV\\Upload\\UploadFolder' => $baseDir . '/../lib/Upload/UploadFolder.php',
     'OCA\\DAV\\Upload\\UploadHome' => $baseDir . '/../lib/Upload/UploadHome.php',
+    'OCA\\DAV\\UserMigration\\CalendarMigrator' => $baseDir . '/../lib/UserMigration/CalendarMigrator.php',
+    'OCA\\DAV\\UserMigration\\CalendarMigratorException' => $baseDir . '/../lib/UserMigration/CalendarMigratorException.php',
+    'OCA\\DAV\\UserMigration\\InvalidCalendarException' => $baseDir . '/../lib/UserMigration/InvalidCalendarException.php',
 );

apps/dav/composer/composer/autoload_static.php

@@ -314,6 +314,9 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Upload\\UploadFile' => __DIR__ . '/..' . '/../lib/Upload/UploadFile.php',
         'OCA\\DAV\\Upload\\UploadFolder' => __DIR__ . '/..' . '/../lib/Upload/UploadFolder.php',
         'OCA\\DAV\\Upload\\UploadHome' => __DIR__ . '/..' . '/../lib/Upload/UploadHome.php',
+        'OCA\\DAV\\UserMigration\\CalendarMigrator' => __DIR__ . '/..' . '/../lib/UserMigration/CalendarMigrator.php',
+        'OCA\\DAV\\UserMigration\\CalendarMigratorException' => __DIR__ . '/..' . '/../lib/UserMigration/CalendarMigratorException.php',
+        'OCA\\DAV\\UserMigration\\InvalidCalendarException' => __DIR__ . '/..' . '/../lib/UserMigration/InvalidCalendarException.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

apps/dav/lib/AppInfo/Application.php

@@ -80,6 +80,7 @@
 use OCA\DAV\Search\ContactsSearchProvider;
 use OCA\DAV\Search\EventsSearchProvider;
 use OCA\DAV\Search\TasksSearchProvider;
+use OCA\DAV\UserMigration\CalendarMigrator;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -165,6 +166,8 @@ public function register(IRegistrationContext $context): void {
 		$context->registerNotifierService(Notifier::class);
 
 		$context->registerCalendarProvider(CalendarProvider::class);
+
+		$context->registerUserMigrator(CalendarMigrator::class);
 	}
 
 	public function boot(IBootContext $context): void {

apps/dav/lib/CalDAV/CalendarImpl.php

@@ -69,6 +69,13 @@ public function getKey() {
 		return $this->calendarInfo['id'];
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getUri(): string {
+		return $this->calendarInfo['uri'];
+	}
+
 	/**
 	 * In comparison to getKey() this function returns a human readable (maybe translated) name
 	 * @return null|string