perf: Replace getById call by getFirstNodeById

We only use the first node anyway and getFirstNodeById is faster

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

lib/Db/PageGarbageCollector.php

@@ -23,7 +23,7 @@ public function purgeObsoletePages(): int {
 		$purgeCount = 0;
 		$rootFolder = $this->folderManager->getRootFolder();
 		foreach ($this->pageMapper->getAll() as $page) {
-			if ($rootFolder->getById($page->getFileId()) === []) {
+			if ($rootFolder->getFirstNodeById($page->getFileId()) === null) {
 				$purgeCount++;
 				$this->pageLinkMapper->deleteByPageId($page->getFileId());
 				$this->pageMapper->delete($page);

lib/Fs/NodeHelper.php

@@ -38,12 +38,12 @@ public function __construct(
 	 * @throws NotFoundException
 	 */
 	public function getFileById(Folder $folder, int $id): File {
-		$file = $folder->getById($id);
+		$file = $folder->getFirstNodeById($id);
 
-		if (count($file) <= 0 || !($file[0] instanceof File)) {
+		if (!($file instanceof File)) {
 			throw new NotFoundException('File not found: ' . $id);
 		}
-		return $file[0];
+		return $file;
 	}
 
 	public static function generateFilename(Folder $folder, string $filename, string $suffix = ''): string {

lib/Migration/GenerateSlugs.php

@@ -111,7 +111,7 @@ private function generatePageSlugs(IOutput $output): void {
 		$rootFolder = $this->collectiveFolderManager->getRootFolder();
 
 		while ($row = $result->fetch()) {
-			$pageFile = $rootFolder->getById($row['file_id'])[0];
+			$pageFile = $rootFolder->getFirstNodeById($row['file_id']);
 			if (!($pageFile instanceof File) || NodeHelper::isLandingPage($pageFile)) {
 				continue;
 			}

lib/Search/PageContentProvider.php

@@ -84,9 +84,9 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 				continue;
 			}
 			foreach ($results as $fileId => $fileData) {
-				$fileEntries = $collectiveRoot->getById($fileId);
-				if (!empty($fileEntries)) {
-					$pages[$fileId] = $fileEntries[0];
+				$fileEntry = $collectiveRoot->getFirstNodeById($fileId);
+				if ($fileEntry !== null) {
+					$pages[$fileId] = $fileEntry;
 					$collectiveMap[$fileId] = $collective;
 				}
 			}

lib/Service/CollectiveShareService.php

@@ -57,21 +57,20 @@ public function createFolderShare(string $userId, string $collectiveName, int $n
 
 		$userFolder = $this->userFolderHelper->get($userId);
 		try {
-			$path = $userFolder->get($collectiveName);
-			if (!($path instanceof Folder)) {
+			$node = $userFolder->get($collectiveName);
+			if (!($node instanceof Folder)) {
 				throw new FilesNotFoundException();
 			}
 			if ($nodeId !== 0) {
-				$nodes = $path->getById($nodeId);
-				if (count($nodes) <= 0) {
+				$node = $node->getFirstNodeById($nodeId);
+				if ($node === null) {
 					throw new FilesNotFoundException();
 				}
-				$path = $nodes[0];
 			}
 		} catch (FilesNotFoundException $e) {
 			throw new NotFoundException('Wrong path, collective folder doesn\'t exist', 0, $e);
 		}
-		$share->setNode($path);
+		$share->setNode($node);
 
 		try {
 			$share->getNode()->lock(ILockingProvider::LOCK_SHARED);

lib/Service/PageService.php

@@ -27,7 +27,6 @@
 use OCP\Files\Node;
 use OCP\Files\NotFoundException as FilesNotFoundException;
 use OCP\Files\NotPermittedException as FilesNotPermittedException;
-use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\Lock\LockedException;
 use OCP\Server;
@@ -48,7 +47,6 @@ public function __construct(
 		private readonly CollectiveServiceBase $collectiveService,
 		private readonly UserFolderHelper $userFolderHelper,
 		private readonly IUserManager $userManager,
-		private readonly IConfig $config,
 		ContainerInterface $container,
 		private readonly SessionService $sessionService,
 		private readonly SluggerInterface $slugger,
@@ -144,7 +142,7 @@ public function getFolder(int $collectiveId, int $fileId, string $userId): Folde
 	 */
 	public function isPageInPageFolder(int $collectiveId, int $parentId, int $pageId, string $userId): void {
 		$folder = $this->getFolder($collectiveId, $parentId, $userId);
-		if (!isset($folder->getById($pageId)[0])) {
+		if ($folder->getFirstNodeById($pageId) === null) {
 			throw new NotFoundException('Page ' . $pageId . ' is not a child of ' . $parentId);
 		}
 	}
@@ -636,9 +634,8 @@ public function findByFileId(int $collectiveId, int $fileId, string $userId, ?in
 		$collectiveFolder = $parentId
 			? $this->getFolder($collectiveId, $parentId, $userId)
 			: $this->getCollectiveFolder($collectiveId, $userId);
-		$pageFile = $collectiveFolder->getById($fileId);
-		if (isset($pageFile[0]) && $pageFile[0] instanceof File) {
-			$pageFile = $pageFile[0];
+		$pageFile = $collectiveFolder->getFirstNodeById($fileId);
+		if ($pageFile instanceof File) {
 			return $this->findByFile($collectiveId, $pageFile, $userId);
 		}
 		throw new NotFoundException('Failed to get page by file ID ' . $fileId . ' in collective ' . $collectiveId);

tests/Unit/Fs/NodeHelperTest.php

@@ -73,10 +73,10 @@ public function testGetFileById(): void {
 		$folder = $this->getMockBuilder(Folder::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$folder->method('getById')
+		$folder->method('getFirstNodeById')
 			->willReturnMap([
-				[1, [$file]],
-				[2, []],
+				[1, $file],
+				[2, null],
 			]);
 
 		self::assertEquals($file, $this->helper->getFileById($folder, 1));

tests/Unit/Search/PageContentProviderTest.php

@@ -46,8 +46,8 @@ protected function setUp(): void {
 		$collectiveService = $this->createMock(CollectiveService::class);
 		/** @var Folder&MockObject $folder */
 		$folder = $this->createMock(Folder::class);
-		$folder->method('getById')
-			->willReturn([]);
+		$folder->method('getFirstNodeById')
+			->willReturn(null);
 		/** @var PageService&MockObject $pageService */
 		$pageService = $this->createMock(PageService::class);
 		$pageService->method('getCollectiveFolder')

tests/Unit/Service/PageServiceTest.php

@@ -90,10 +90,6 @@ protected function setUp(): void {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$container = $this->getMockBuilder(ContainerInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-
 		$sessionService = $this->getMockBuilder(SessionService::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -114,7 +110,6 @@ protected function setUp(): void {
 			$userFolderHelper,
 			$userManager,
 			$this->config,
-			$container,
 			$sessionService,
 			$slugger,
 			$tagMapper,