1 files changed, 23 insertions, 78 deletions

diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php
index 03a3d3f4a7c..d542b82d5e1 100644
--- a/lib/private/Migration/BackgroundRepair.php
+++ b/lib/private/Migration/BackgroundRepair.php
@@ -1,40 +1,18 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @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/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OC\Migration;
 
-use OC\BackgroundJob\JobList;
-use OC\BackgroundJob\TimedJob;
-use OC\NeedsUpdateException;
 use OC\Repair;
-use OC_App;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
-use OCP\ILogger;
+use OCP\BackgroundJob\TimedJob;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Class BackgroundRepair
@@ -42,41 +20,22 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * @package OC\Migration
  */
 class BackgroundRepair extends TimedJob {
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	public function __construct(EventDispatcherInterface $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * run the job, then remove it from the job list
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		// add an interval of 15 mins
+	public function __construct(
+		private Repair $repair,
+		ITimeFactory $time,
+		private LoggerInterface $logger,
+		private IJobList $jobList,
+		private IAppManager $appManager,
+	) {
+		parent::__construct($time);
 		$this->setInterval(15 * 60);
-
-		$this->jobList = $jobList;
-		$this->logger = $logger;
-		parent::execute($jobList, $logger);
 	}
 
 	/**
 	 * @param array $argument
 	 * @throws \Exception
-	 * @throws \OC\NeedsUpdateException
 	 */
-	protected function run($argument) {
+	protected function run($argument): void {
 		if (!isset($argument['app']) || !isset($argument['step'])) {
 			// remove the job - we can never execute it
 			$this->jobList->remove($this, $this->argument);
@@ -84,21 +43,16 @@ class BackgroundRepair extends TimedJob {
 		}
 		$app = $argument['app'];
 
-		try {
-			$this->loadApp($app);
-		} catch (NeedsUpdateException $ex) {
-			// as long as the app is not yet done with it's offline migration
-			// we better not start with the live migration
-			return;
-		}
+		$this->appManager->loadApp($app);
 
 		$step = $argument['step'];
-		$repair = new Repair([], $this->dispatcher, \OC::$server->get(LoggerInterface::class));
+		$this->repair->setRepairSteps([]);
 		try {
-			$repair->addStep($step);
+			$this->repair->addStep($step);
 		} catch (\Exception $ex) {
-			$this->logger->logException($ex, [
-				'app' => 'migration'
+			$this->logger->error($ex->getMessage(), [
+				'app' => 'migration',
+				'exception' => $ex,
 			]);
 
 			// remove the job - we can never execute it
@@ -107,18 +61,9 @@ class BackgroundRepair extends TimedJob {
 		}
 
 		// execute the repair step
-		$repair->run();
+		$this->repair->run();
 
 		// remove the job once executed successfully
 		$this->jobList->remove($this, $this->argument);
 	}
-
-	/**
-	 * @codeCoverageIgnore
-	 * @param $app
-	 * @throws NeedsUpdateException
-	 */
-	protected function loadApp($app) {
-		OC_App::loadApp($app);
-	}
 }