code review fixes

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Controller/Api1Controller.php

@@ -327,7 +327,7 @@ public function deleteTable(int $tableId): DataResponse {
 	public function indexViews(int $tableId): DataResponse {
 		try {
 			$table = $this->tableService->find($tableId);
-			return new DataResponse($this->viewService->formatViews($this->viewService->findAll($table, tableRowsCount: $table->getRowsCount())));
+			return new DataResponse($this->viewService->formatViews($table->getViews() ?? []));
 		} catch (PermissionError $e) {
 			$this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]);
 			$message = ['message' => $e->getMessage()];

lib/Db/ColumnMapper.php

@@ -173,27 +173,19 @@ public function countColumnsForTables(array $tableIds): array {
 			return [];
 		}
 
-		$counts = [];
+		$counts = array_fill_keys($tableIds, 0);
 		foreach (array_chunk($tableIds, 1000 - 1) as $tableIdsChunk) {
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('table_id', $qb->func()->count('*', 'counter'))
 				->from($this->table)
 				->where($qb->expr()->in('table_id', $qb->createNamedParameter($tableIdsChunk, IQueryBuilder::PARAM_INT_ARRAY)))
 				->groupBy('table_id');
 
-			try {
-				$result = $qb->executeQuery();
-				while ($row = $result->fetch()) {
-					$counts[(int)$row['table_id']] = (int)$row['counter'];
-				}
-				$result->closeCursor();
-			} catch (Exception $e) {
-				$this->logger->warning('Exception occurred: ' . $e->getMessage() . ' Returning 0 for all given tables.');
+			$result = $qb->executeQuery();
+			while ($row = $result->fetch()) {
+				$counts[(int)$row['table_id']] = (int)$row['counter'];
 			}
-		}
-
-		foreach ($tableIds as $tableId) {
-			$counts[$tableId] ??= 0;
+			$result->closeCursor();
 		}
 
 		return $counts;

lib/Db/RowSleeveMapper.php

@@ -111,27 +111,19 @@ public function countRowsForTables(array $tableIds): array {
 			return [];
 		}
 
-		$counts = [];
+		$counts = array_fill_keys($tableIds, 0);
 		foreach (array_chunk($tableIds, 1000 - 1) as $tableIdsChunk) {
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('table_id', $qb->func()->count('*', 'counter'))
-				->from($this->table, 't1')
+				->from($this->table)
 				->where($qb->expr()->in('table_id', $qb->createNamedParameter($tableIdsChunk, IQueryBuilder::PARAM_INT_ARRAY)))
 				->groupBy('table_id');
 
-			try {
-				$result = $qb->executeQuery();
-				while ($row = $result->fetch()) {
-					$counts[(int)$row['table_id']] = (int)$row['counter'];
-				}
-				$result->closeCursor();
-			} catch (Exception $e) {
-				$this->logger->warning('Exception occurred: ' . $e->getMessage() . ' Will return 0 for all given tables.');
+			$result = $qb->executeQuery();
+			while ($row = $result->fetch()) {
+				$counts[(int)$row['table_id']] = (int)$row['counter'];
 			}
-		}
-
-		foreach ($tableIds as $tableId) {
-			$counts[$tableId] ??= 0;
+			$result->closeCursor();
 		}
 
 		return $counts;

lib/Db/ShareMapper.php

@@ -130,6 +130,10 @@ public function findAllSharesForNode(string $nodeType, int $nodeId, string $send
 			->andWhere($qb->expr()->eq('node_type', $qb->createNamedParameter($nodeType, IQueryBuilder::PARAM_STR)))
 			->andWhere($qb->expr()->eq('node_id', $qb->createNamedParameter($nodeId, IQueryBuilder::PARAM_INT)));
 
+		if ($sender !== '') {
+			$qb->andWhere($qb->expr()->eq('sender', $qb->createNamedParameter($sender, IQueryBuilder::PARAM_STR)));
+		}
+
 		if (!empty($excluded)) {
 			$qb->andWhere($qb->expr()->notIn('receiver_type', $qb->createNamedParameter($excluded, IQueryBuilder::PARAM_STR_ARRAY)));
 		}

lib/Service/ShareService.php

@@ -266,16 +266,12 @@ public function countSharesForTables(array $tableIds, ?string $userId = null): a
 			$excluded = !$this->circleHelper->isCirclesEnabled() ? [ShareReceiverType::CIRCLE] : [];
 			$shares = $this->mapper->findAllSharesForNodes('table', $tableIds, $userId, $excluded);
 
-			$counts = [];
+			$counts = array_fill_keys($tableIds, 0);
 			foreach ($shares as $share) {
 				$nodeId = $share->getNodeId();
 				$counts[$nodeId] = ($counts[$nodeId] ?? 0) + 1;
 			}
 
-			foreach ($tableIds as $tableId) {
-				$counts[$tableId] ??= 0;
-			}
-
 			return $counts;
 		} catch (Exception $e) {
 			$this->logger->error($e->getMessage());
@@ -296,16 +292,12 @@ public function countSharesForViews(array $viewIds, ?string $userId = null): arr
 			$excluded = !$this->circleHelper->isCirclesEnabled() ? [ShareReceiverType::CIRCLE] : [];
 			$shares = $this->mapper->findAllSharesForNodes('view', $viewIds, $userId, $excluded);
 
-			$counts = [];
+			$counts = array_fill_keys($viewIds, 0);
 			foreach ($shares as $share) {
 				$nodeId = $share->getNodeId();
 				$counts[$nodeId] = ($counts[$nodeId] ?? 0) + 1;
 			}
 
-			foreach ($viewIds as $viewId) {
-				$counts[$viewId] ??= 0;
-			}
-
 			return $counts;
 		} catch (Exception $e) {
 			$this->logger->error($e->getMessage());

lib/Service/ViewService.php

@@ -597,8 +597,8 @@ private function setIsSharedState(View $view, string $userId, ?int $sharesCount
 					$view->setHasShares($sharesCount > 0);
 				} else {
 					try {
-						$allShares = $this->shareService->findAll('view', $view->getId(), $userId);
-						$view->setHasShares(count($allShares) !== 0);
+						$counts = $this->shareService->countSharesForViews([$view->getId()], $userId);
+						$view->setHasShares(($counts[$view->getId()] ?? 0) > 0);
 					} catch (InternalError $e) {
 					}
 				}