Merge pull request #881 from nextcloud/fix/view-update-delete

fix: Filter returned entity result by view columns
nextcloud · Feb 29, 2024 · a11cfa0 · a11cfa0
2 parents 0b5575c + 3c039ba
commit a11cfa0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/lib/Db/Row2.php b/lib/Db/Row2.php
@@ -107,6 +107,16 @@ public function insertOrUpdateCell(array $entry): string {
 		return 'inserted';
 	}
 
+	/**
+	 * @param int[] $columns
+	 */
+	public function filterDataByColumns(array $columns): array {
+		$this->data = array_values(array_filter($this->data, function ($entry) use ($columns) {
+			return in_array($entry['columnId'], $columns);
+		}));
+		return $this->data;
+	}
+
 	/**
 	 * @psalm-return TablesRow
 	 */

diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php
@@ -397,7 +397,7 @@ public function updateSet(
 			}
 		}
 
-		return $this->row2Mapper->update($item, $columns);
+		return $this->filterRowResult($view ?? null, $this->row2Mapper->update($item, $columns));
 	}
 
 	/**
@@ -450,7 +450,7 @@ public function delete(int $id, ?int $viewId, string $userId): Row2 {
 		}
 
 		try {
-			return $this->row2Mapper->delete($item);
+			return $this->filterRowResult($view ?? null, $this->row2Mapper->delete($item));
 		} catch (Exception $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
@@ -522,4 +522,14 @@ public function getViewRowsCount(View $view, string $userId): int {
 			throw new PermissionError('no read access for counting to view id = '.$view->getId());
 		}
 	}
+
+	private function filterRowResult(?View $view, Row2 $row): Row2 {
+		if ($view === null) {
+			return $row;
+		}
+
+		$row->filterDataByColumns($view->getColumnsArray());
+
+		return $row;
+	}
 }