Changed IExportOperation to be IMigrationOperation with both import and export methods

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/IExportOperation.php lib/IMigrationOperation.phplib/IExportOperation.php renamed to lib/IMigrationOperation.php

@@ -28,7 +28,16 @@
 
 use OCP\IUser;
 
-interface IExportOperation {
+interface IMigrationOperation {
+	public function export(
+		string $appId,
+		IUser $user,
+		IExportDestination $exportDestination,
+		OutputInterface $output): void;
 
-	public function run(string $appId, IUser $user, string $exportRoot): void;
+	public function import(
+		string $appId,
+		IUser $user,
+		IImportSource $importSource,
+		OutputInterface $output): void;
 }

lib/Service/UserMigrationService.php

@@ -33,8 +33,8 @@
 use OCA\UserMigration\Exception\UserMigrationException;
 use OCA\UserMigration\ExportDestination;
 use OCA\UserMigration\IExportDestination;
-use OCA\UserMigration\IExportOperation;
 use OCA\UserMigration\IImportSource;
+use OCA\UserMigration\IMigrationOperation;
 use OCA\UserMigration\ImportSource;
 use OC\Files\AppData;
 use OC\Files\Filesystem;
@@ -156,10 +156,10 @@ public function export(IUser $user, ?OutputInterface $output = null): string {
 		$context = $this->coordinator->getRegistrationContext();
 
 		if ($context !== null) {
-			foreach ($context->getExportOperations() as $registration) {
-				/** @var IExportOperation $operation */
+			foreach ($context->getMigrationOperations() as $registration) {
+				/** @var IMigrationOperation $operation */
 				$operation = $this->container->get($registration->getService());
-				$operation->run($registration->getAppId(), $user, $exportFolder);
+				$operation->export($registration->getAppId(), $user, $exportDestination, $output);
 			}
 		}
 
@@ -181,6 +181,18 @@ public function import(string $path, ?OutputInterface $output = null): void {
 			$this->importAccountInformation($user, $importSource, $output);
 			$this->importAppsSettings($user, $importSource, $output);
 			$this->importFiles($user, $importSource, $output);
+
+			// Run imports for other apps
+			$context = $this->coordinator->getRegistrationContext();
+
+			if ($context !== null) {
+				foreach ($context->getMigrationOperations() as $registration) {
+					/** @var IMigrationOperation $operation */
+					$operation = $this->container->get($registration->getService());
+					$operation->import($registration->getAppId(), $user, $importSource, $output);
+				}
+			}
+
 			$uid = $user->getUID();
 			$output->writeln("Successfully imported $uid from $path");
 		} finally {