Enhancement: Update rows via import (code review fixes)

Signed-off-by: Kostiantyn Miakshyn <[email protected]>

Author: Koc

lib/Controller/Api1Controller.php

@@ -1282,7 +1282,7 @@ public function updateRow(int $rowId, ?int $viewId, $data): DataResponse {
 		}
 
 		try {
-			return new DataResponse($this->rowService->updateSet($rowId, $viewId, $dataNew, $this->userId)->jsonSerialize());
+			return new DataResponse($this->rowService->updateSet($rowId, $viewId, $dataNew, $this->userId, null)->jsonSerialize());
 		} catch (InternalError $e) {
 			$this->logger->error('An internal error or exception occurred: ' . $e->getMessage(), ['exception' => $e]);
 			$message = ['message' => $e->getMessage()];

lib/Controller/RowController.php

@@ -74,7 +74,7 @@ public function update(
 			$columnId,
 			$data
 		) {
-			return $this->service->updateSet($id, $viewId, ['columnId' => $columnId, 'value' => $data], $this->userId);
+			return $this->service->updateSet($id, $viewId, ['columnId' => $columnId, 'value' => $data], $this->userId, null);
 		});
 	}
 
@@ -83,18 +83,13 @@ public function updateSet(
 		int $id,
 		?int $viewId,
 		array $data,
-
 	): DataResponse {
 		return $this->handleError(function () use (
 			$id,
 			$viewId,
 			$data
 		) {
-			return $this->service->updateSet(
-				$id,
-				$viewId,
-				$data,
-				$this->userId);
+			return $this->service->updateSet($id, $viewId, $data, $this->userId, null);
 		});
 	}
 

lib/Service/ImportService.php

@@ -462,7 +462,7 @@ private function upsertRow(Row $row): void {
 
 			if ($id) {
 				try {
-					$this->rowService->updateSet($id, $this->viewId, $data, $this->userId);
+					$this->rowService->updateSet($id, $this->viewId, $data, $this->userId, $this->tableId);
 					$this->countUpdatedRows++;
 					return;
 				} catch (\Throwable $e) {

lib/Service/RowService.php

@@ -383,6 +383,7 @@ public function updateSet(
 		?int $viewId,
 		array $data,
 		string $userId,
+		?int $tableId,
 	): Row2 {
 		try {
 			$item = $this->getRowById($id);
@@ -432,8 +433,14 @@ public function updateSet(
 				throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': ' . $e->getMessage());
 			}
 		} else {
-			// if no view id is set, we assume a table and take the tableId from the row
-			$tableId = $item->getTableId();
+			if ($tableId === null) {
+				$tableId = $item->getTableId();
+			}
+			if ($tableId !== $item->getTableId()) {
+				$e = new \Exception('Row does not belong to table with id ' . $tableId);
+				$this->logger->error($e->getMessage(), ['exception' => $e]);
+				throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': ' . $e->getMessage());
+			}
 
 			// security
 			if (!$this->permissionsService->canReadRowsByElementId($item->getTableId(), 'table', $userId)) {