refactor(systemtags): Port to snowflake ids

Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>

Author: CarlSchwan

apps/systemtags/composer/composer/autoload_classmap.php

@@ -21,6 +21,7 @@
     'OCA\\SystemTags\\Listeners\\LoadAdditionalScriptsListener' => $baseDir . '/../lib/Listeners/LoadAdditionalScriptsListener.php',
     'OCA\\SystemTags\\Migration\\Version31000Date20241018063111' => $baseDir . '/../lib/Migration/Version31000Date20241018063111.php',
     'OCA\\SystemTags\\Migration\\Version31000Date20241114171300' => $baseDir . '/../lib/Migration/Version31000Date20241114171300.php',
+    'OCA\\SystemTags\\Migration\\Version33000Date20251104171300' => $baseDir . '/../lib/Migration/Version33000Date20251104171300.php',
     'OCA\\SystemTags\\Search\\TagSearchProvider' => $baseDir . '/../lib/Search/TagSearchProvider.php',
     'OCA\\SystemTags\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
 );

apps/systemtags/composer/composer/autoload_static.php

@@ -36,6 +36,7 @@ class ComposerStaticInitSystemTags
         'OCA\\SystemTags\\Listeners\\LoadAdditionalScriptsListener' => __DIR__ . '/..' . '/../lib/Listeners/LoadAdditionalScriptsListener.php',
         'OCA\\SystemTags\\Migration\\Version31000Date20241018063111' => __DIR__ . '/..' . '/../lib/Migration/Version31000Date20241018063111.php',
         'OCA\\SystemTags\\Migration\\Version31000Date20241114171300' => __DIR__ . '/..' . '/../lib/Migration/Version31000Date20241114171300.php',
+        'OCA\\SystemTags\\Migration\\Version33000Date20251104171300' => __DIR__ . '/..' . '/../lib/Migration/Version33000Date20251104171300.php',
         'OCA\\SystemTags\\Search\\TagSearchProvider' => __DIR__ . '/..' . '/../lib/Search/TagSearchProvider.php',
         'OCA\\SystemTags\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
     );

apps/systemtags/lib/Migration/Version33000Date20251104171300.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\SystemTags\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Types;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\Attributes\AddColumn;
+use OCP\Migration\Attributes\ColumnType;
+use OCP\Migration\Attributes\ModifyColumn;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Remove auto-increment to use snowflake ids
+ */
+#[ModifyColumn(table: 'systemtag', name: 'id', type: ColumnType::BIGINT, description: 'Remove auto-increment')]
+class Version33000Date20251104171300 extends SimpleMigrationStep {
+
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if ($schema->hasTable('systemtag')) {
+			$schema->dropAutoincrementColumn('systemtag', 'id');
+		}
+
+		return $schema;
+	}
+}

lib/private/SystemTag/SystemTagManager.php

@@ -16,6 +16,7 @@
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\Snowflake\IGenerator;
 use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ManagerEvent;
@@ -42,6 +43,7 @@ public function __construct(
 		protected IEventDispatcher $dispatcher,
 		private IUserSession $userSession,
 		private IAppConfig $appConfig,
+		private IGenerator $generator,
 	) {
 		$query = $this->connection->getQueryBuilder();
 		$this->selectTagQuery = $query->select('*')
@@ -167,8 +169,10 @@ public function createTag(string $tagName, bool $userVisible, bool $userAssignab
 		// Length of name column is 64
 		$truncatedTagName = substr($tagName, 0, 64);
 		$query = $this->connection->getQueryBuilder();
+		$tagId = $this->generator->nextId();
 		$query->insert(self::TAG_TABLE)
 			->values([
+				'id' => $query->createNamedParameter($tagId),
 				'name' => $query->createNamedParameter($truncatedTagName),
 				'visibility' => $query->createNamedParameter($userVisible ? 1 : 0),
 				'editable' => $query->createNamedParameter($userAssignable ? 1 : 0),
@@ -188,10 +192,8 @@ public function createTag(string $tagName, bool $userVisible, bool $userAssignab
 			throw $e;
 		}
 
-		$tagId = $query->getLastInsertId();
-
 		$tag = new SystemTag(
-			(string)$tagId,
+			$tagId,
 			$truncatedTagName,
 			$userVisible,
 			$userAssignable

tests/lib/SystemTag/SystemTagManagerTest.php

@@ -17,6 +17,7 @@
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Server;
+use OCP\Snowflake\IGenerator;
 use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\TagAlreadyExistsException;
@@ -36,6 +37,7 @@ class SystemTagManagerTest extends TestCase {
 	private IUserSession $userSession;
 	private IAppConfig $appConfig;
 	private IEventDispatcher $dispatcher;
+	private IGenerator $generator;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -46,13 +48,15 @@ protected function setUp(): void {
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->generator = Server::get(IGenerator::class);
 
 		$this->tagManager = new SystemTagManager(
 			$this->connection,
 			$this->groupManager,
 			$this->dispatcher,
 			$this->userSession,
 			$this->appConfig,
+			$this->generator,
 		);
 		$this->pruneTagsTables();
 	}
@@ -296,8 +300,8 @@ public static function updateTagProvider(): array {
 		return [
 			[
 				// update name
-				['one', true, true, '0082c9'],
-				['two', true, true, '0082c9']
+				['one', true, true],
+				['two', true, true]
 			],
 			[
 				// update one flag
@@ -323,7 +327,6 @@ public function testUpdateTag($tagCreate, $tagUpdated): void {
 			$tagCreate[0],
 			$tagCreate[1],
 			$tagCreate[2],
-			$tagCreate[3],
 		);
 		$this->tagManager->updateTag(
 			$tag1->getId(),
@@ -336,7 +339,6 @@ public function testUpdateTag($tagCreate, $tagUpdated): void {
 			$tagUpdated[0],
 			$tagUpdated[1],
 			$tagUpdated[2],
-			$tagUpdated[3],
 		);
 
 		$this->assertEquals($tag2->getId(), $tag1->getId());