Add repair step for default tags

appinfo/info.xml

@@ -38,6 +38,7 @@
 	</dependencies>
 	<repair-steps>
 		<post-migration>
+			<step>OCA\Mail\Migration\AddMissingDefaultTags</step>
 			<step>OCA\Mail\Migration\AddMissingMessageIds</step>
 			<step>OCA\Mail\Migration\FixCollectedAddresses</step>
 			<step>OCA\Mail\Migration\FixBackgroundJobs</step>

lib/Migration/AddMissingDefaultTags.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2021 Anna Larch <anna@nextcloud.com>
+ *
+ * @author 2021 Anna Larch <anna@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @link https://github.com/nextcloud/mail/issues/25
+ * @link https://github.com/nextcloud/mail/issues/4780
+ */
+
+namespace OCA\Mail\Migration;
+
+use OCA\Mail\Db\MailAccountMapper;
+use OCA\Mail\Db\TagMapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use function sprintf;
+
+class AddMissingDefaultTags implements IRepairStep {
+
+	/** @var TagMapper */
+	private $tagMapper;
+
+	/** @var MailAccountMapper */
+	private $accountMapper;
+
+
+	public function __construct(MailAccountMapper $accountMapper,
+								TagMapper $tagMapper) {
+		$this->accountMapper = $accountMapper;
+		$this->tagMapper = $tagMapper;
+	}
+
+	public function getName() {
+		return 'Restore default tags that are missing';
+	}
+
+	public function run(IOutput $output) {
+		$output->info('Looking up default tags');
+		$accounts = $this->accountMapper->getAllAccounts();
+
+		$output->info(sprintf('%d accounts to check found', count($accounts)));
+		$output->startProgress(count($accounts));
+		foreach ($accounts as $account) {
+			$this->tagMapper->createDefaultTags($account);
+			$output->advance();
+		}
+		$output->finishProgress();
+	}
+}

lib/Migration/Version1100Date20210304143008.php

@@ -5,8 +5,6 @@
 namespace OCA\Mail\Migration;
 
 use Closure;
-use OCA\Mail\Db\MailAccountMapper;
-use OCA\Mail\Db\TagMapper;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -16,21 +14,6 @@
  */
 class Version1100Date20210304143008 extends SimpleMigrationStep {
 
-	/**
-	 * @var TagMapper
-	 */
-	protected $tagMapper;
-
-	/**
-	 * @var MailAccountMapper
-	 */
-	protected $mailAccountMapper;
-
-	public function __construct(TagMapper $tagMapper, MailAccountMapper $mailAccountMapper) {
-		$this->tagMapper = $tagMapper;
-		$this->mailAccountMapper = $mailAccountMapper;
-	}
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
@@ -105,16 +88,4 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		}
 		return $schema;
 	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$accounts = $this->mailAccountMapper->getAllUserIdsWithAccounts();
-		foreach ($accounts as $account) {
-			$this->tagMapper->createDefaultTags($account);
-		}
-	}
 }