Backport: Add user as workspace manager with workspace:create command, even if the workspace already exists

lib/Commands/Create.php

@@ -25,7 +25,6 @@
 namespace OCA\Workspace\Commands;
 
 use OCA\Workspace\Group\Admin\AdminGroup;
-use OCA\Workspace\Group\Admin\AdminGroupManager;
 use OCA\Workspace\Group\User\UserGroup;
 use OCA\Workspace\Group\User\UserGroupManager;
 use OCA\Workspace\Helper\GroupfolderHelper;
@@ -131,7 +130,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			}
 		}
 
-		$workspace = $this->spaceManager->create($spacename);
+		try {
+			$workspace = $this->spaceManager->create($spacename);
+		} catch(\OCA\Workspace\Exceptions\WorkspaceNameExistException $e) {
+			$output->writeln(sprintf('The space %s already exists', $spacename));
+			$workspace = $this->spaceManager->getByName($spacename);
+		}
 
 		if ($input->hasParameterOption('--user-workspace-manager')) {
 			$userManagerName = $input->getOption('user-workspace-manager');
@@ -220,8 +224,7 @@ private function convertToByte(string $value): int {
 
 	private function addUserToAdminGroupManager(string $username, array $workspace): bool {
 		$user = $this->userFinder->findUser($username);
-		$groupname = AdminGroupManager::findWorkspaceManager($workspace);
-		$this->adminGroup->addUser($user, $groupname);
+		$this->adminGroup->addUser($user, (int) $workspace['id']);
 
 		return true;
 	}

lib/Db/SpaceMapper.php

@@ -46,6 +46,19 @@ public function find($id): Space {
 		return $this->findEntity($query);
 	}
 
+	/**
+	 * retrieve a space with its name
+	 */
+	public function findByName($spacename): Space {
+		$qb = $this->db->getQueryBuilder();
+		$query = $qb->select('*')
+			->from($this->getTableName())
+			->where(
+				$qb->expr()->eq('space_name', $qb->createNamedParameter($spacename, $qb::PARAM_STR))
+			);
+		return $this->findEntity($query);
+	}
+
 	/**
 	 * work
 	 * @return Space[]

lib/Space/SpaceManager.php

@@ -133,6 +133,7 @@ public function create(string $spacename): array {
 
 		return [
 			'name' => $space->getSpaceName(),
+			'id' => $space->getId(),
 			'id_space' => $space->getId(),
 			'folder_id' => $space->getGroupfolderId(),
 			'color' => $space->getColorCode(),
@@ -153,8 +154,12 @@ public function get(int $spaceId): array {
 
 		$space = $this->spaceMapper->find($spaceId);
 		$groupfolder = $this->folderHelper->getFolder($space->getGroupfolderId(), $this->rootFolder->getRootFolderStorageId());
+		if ($groupfolder === false) {
+			return [];
+		}
 
 		$workspace = array_merge($space->jsonSerialize(), $groupfolder);
+		$workspace['id'] = $space->getSpaceId();
 
 		$folderInfo = $this->folderHelper->getFolder(
 			$workspace['groupfolder_id'],
@@ -178,6 +183,14 @@ public function get(int $spaceId): array {
 		return $workspace;
 	}
 
+	public function getByName(string $spacename): array {
+		$space = $this->spaceMapper->findByName($spacename);
+		if ($space === null) {
+			return [];
+		}
+		return $this->get($space->getSpaceId());
+	}
+
 	public function attachGroup(int $folderId, string $gid): void {
 		$this->folderHelper->addApplicableGroup($folderId, $gid);
 	}

tests/Unit/Space/SpaceManagerTest.php

@@ -232,6 +232,7 @@ public function testArrayAfterCreatedTheEspace01Workspace(): void {
 			$space,
 			[
 				'name' => 'Espace01',
+				'id' => null,
 				'id_space' => null,
 				'folder_id' => 1,
 				'color' => '#a50b1c',