enh: modify usergroup column backend

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>

lib/Db/Column.php

@@ -149,8 +149,8 @@ public function __construct() {
 
 	public function getUsergroupDefaultArray():array {
 		$default = $this->getUsergroupDefault();
-		if ($default !== "" && $default !== null && $default !== 'null') {
-			return \json_decode($default, true);
+		if ($default !== "" && $default !== null) {
+			return \json_decode($default, true) ?? [];
 		} else {
 			return [];
 		}

lib/Db/LegacyRowMapper.php

@@ -8,7 +8,6 @@
 use OCA\Tables\Db\ColumnTypes\SelectionColumnQB;
 use OCA\Tables\Db\ColumnTypes\SuperColumnQB;
 use OCA\Tables\Db\ColumnTypes\TextColumnQB;
-use OCA\Tables\Db\ColumnTypes\UsergroupColumnQB;
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Helper\UserHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -30,7 +29,6 @@ class LegacyRowMapper extends QBMapper {
 	protected SelectionColumnQB $selectionColumnQB;
 	protected NumberColumnQB $numberColumnQB;
 	protected DatetimeColumnQB $datetimeColumnQB;
-	protected UsergroupColumnQB $usergroupColumnQB;
 	protected SuperColumnQB $genericColumnQB;
 	protected ColumnMapper $columnMapper;
 	protected LoggerInterface $logger;
@@ -46,7 +44,6 @@ public function __construct(
 		SelectionColumnQB $selectionColumnQB,
 		NumberColumnQB $numberColumnQB,
 		DatetimeColumnQB $datetimeColumnQB,
-		UsergroupColumnQB $usergroupColumnQB,
 		SuperColumnQB $columnQB,
 		ColumnMapper $columnMapper,
 		UserHelper $userHelper,
@@ -57,7 +54,6 @@ public function __construct(
 		$this->numberColumnQB = $numberColumnQB;
 		$this->selectionColumnQB = $selectionColumnQB;
 		$this->datetimeColumnQB = $datetimeColumnQB;
-		$this->usergroupColumnQB = $usergroupColumnQB;
 		$this->genericColumnQB = $columnQB;
 		$this->columnMapper = $columnMapper;
 		$this->userHelper = $userHelper;
@@ -78,7 +74,6 @@ private function setPlatform() {
 		$this->numberColumnQB->setPlatform($this->platform);
 		$this->selectionColumnQB->setPlatform($this->platform);
 		$this->datetimeColumnQB->setPlatform($this->platform);
-		$this->usergroupColumnQB->setPlatform($this->platform);
 	}
 
 	/**

lib/Db/Row2Mapper.php

@@ -10,6 +10,7 @@
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Db\QBMapper;
+use OCP\AppFramework\Db\TTransactional;
 use OCP\DB\Exception;
 use OCP\DB\IResult;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -21,6 +22,8 @@
 use Throwable;
 
 class Row2Mapper {
+	use TTransactional;
+
 	private RowSleeveMapper $rowSleeveMapper;
 	private ?string $userId = null;
 	private IDBConnection $db;
@@ -524,7 +527,7 @@ private function parseEntities(IResult $result, array $sleeves, array $columnTyp
 			$value = $this->formatValue($this->columns[$rowData['column_id']], $rowData['value'], 'out', $rowData['value_type']);
 			$compositeKey = (string)$rowData['row_id'] . ',' . (string)$rowData['column_id'];
 
-			if ($columnTypes[$rowData['column_id']] == 'usergroup') {
+			if ($columnTypes[$rowData['column_id']] === Column::TYPE_USERGROUP) {
 				if (array_key_exists($compositeKey, $rowValues)) {
 					$rowValues[$compositeKey][] = $value;
 				} else {
@@ -688,7 +691,7 @@ private function insertCell(int $rowId, int $columnId, $value, ?string $lastEdit
 
 		$v = $this->formatValue($this->columns[$columnId], $value, 'in');
 
-		if ($this->columns[$columnId]->getType() == 'usergroup') {
+		if ($this->columns[$columnId]->getType() === Column::TYPE_USERGROUP) {
 			foreach ($v as $val) {
 				/** @var RowCellSuper $cell */
 				$cell = new $cellClassName();
@@ -748,11 +751,12 @@ private function insertOrUpdateCell(int $rowId, int $columnId, $value): void {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
 		}
-		if ($columnType == 'usergroup') {
+		if ($columnType === Column::TYPE_USERGROUP) {
 			try {
-				// TODO Maybe these should be a transaction?
-				$cellMapper->deleteAllForRow($rowId);
-				$this->insertCell($rowId, $columnId, $value);
+				$this->atomic(function () use ($cellMapper, $rowId, $columnId, $value) {
+					$cellMapper->deleteAllForRow($rowId);
+					$this->insertCell($rowId, $columnId, $value);
+				}, $this->db);
 			} catch (Exception $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
 				throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());

lib/Db/RowCellMapperSuper.php

@@ -86,21 +86,6 @@ public function findByRowAndColumn(int $rowId, int $columnId): RowCellSuper {
 		return $this->findEntity($qb);
 	}
 
-	// 	/**
-	//  * @throws MultipleObjectsReturnedException
-	//  * @throws DoesNotExistException
-	//  * @throws Exception
-	//  */
-	// public function findMultByRowAndColumn(int $rowId, int $columnId): array{
-	// 	$qb = $this->db->getQueryBuilder();
-	// 	$qb->select('*')
-	// 		->from($this->tableName)
-	// 		->where($qb->expr()->eq('row_id', $qb->createNamedParameter($rowId, IQueryBuilder::PARAM_INT)))
-	// 		->andWhere($qb->expr()->eq('column_id', $qb->createNamedParameter($columnId, IQueryBuilder::PARAM_INT)));
-	// 	return $this->findEntities($qb);
-	// }
-
-
 	/**
 	 * @throws MultipleObjectsReturnedException
 	 * @throws DoesNotExistException

lib/Service/ColumnTypes/UsergroupBusiness.php

@@ -40,7 +40,6 @@ public function canBeParsed($value, ?Column $column = null): bool {
 		}
 
 		foreach ($value as $v) {
-			// TODO: maybe check if key exists first
 			if((array_key_exists('id', $v) && !is_string($v['id'])) && (array_key_exists('type', $v) && !is_int($v['type']))) {
 				return false;
 			}