fix(API): take over UUID when importing a scheme

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Author: blizzz

lib/Controller/ApiTablesController.php

@@ -22,6 +22,7 @@
 use OCA\Tables\Service\ColumnService;
 use OCA\Tables\Service\TableService;
 use OCA\Tables\Service\ViewService;
+use OCA\Tables\Vendor\Symfony\Component\Uid\Uuid;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -153,6 +154,9 @@ public function createFromScheme(string $title, string $emoji, string $descripti
 			$table = $this->service->create($title, 'custom', $emoji, $description);
 			$colMap = [];
 			foreach ($columns as $column) {
+				if (isset($column['uuid']) && !Uuid::isValid($column['uuid'])) {
+					throw new \InvalidArgumentException('Invalid UUID provided');
+				}
 				$col = $this->columnService->create(
 					$this->userId,
 					$table->getId(),
@@ -182,7 +186,8 @@ public function createFromScheme(string $title, string $emoji, string $descripti
 						usergroupSelectGroups: $column['usergroupSelectGroups'],
 						usergroupSelectTeams: $column['usergroupSelectTeams'],
 						showUserStatus: $column['showUserStatus'],
-						customSettings: empty($column['customSettings']) ? null : json_encode($column['customSettings'])
+						customSettings: empty($column['customSettings']) ? null : json_encode($column['customSettings']),
+						uuid: $column['uuid'] ?? null,
 					)
 				);
 				$colMap[$column['id']] = $col->getId();

lib/Db/Column.php

@@ -242,7 +242,7 @@ private function applyUuid(string $uuid): void {
 
 	public static function fromDto(ColumnDto $data): self {
 		$column = new self();
-		$column->assignUuid();
+		$column->setOrAssignUuid($data->getUuid());
 		$column->setTitle($data->getTitle());
 		$column->setType($data->getType());
 		$column->setSubtype($data->getSubtype() ?? '');

lib/Dto/Column.php

@@ -34,6 +34,7 @@ public function __construct(
 		private ?bool $usergroupSelectTeams = null,
 		private ?bool $showUserStatus = null,
 		private ?string $customSettings = null,
+		private ?string $uuid = null,
 	) {
 	}
 
@@ -69,9 +70,14 @@ public static function createFromArray(array $data): self {
 			usergroupSelectTeams: $data['usergroupSelectTeams'] ?? null,
 			showUserStatus: $data['showUserStatus'] ?? null,
 			customSettings: $customSettings,
+			uuid: $data['uuid'] ?? null,
 		);
 	}
 
+	public function getUuid(): ?string {
+		return $this->uuid;
+	}
+
 	public function getType(): ?string {
 		return $this->type;
 	}