Merge pull request #211 from nextcloud/artonge/fix/getbyid

fix: Migrate `getById` to `getFirstNodeById`

Author: artonge

lib/BackgroundJobs/FileSystemListenerJob.php

@@ -84,7 +84,7 @@ protected function run($argument): void {
 				}
 
 				try {
-					$node = current($this->rootFolder->getUserFolder($fsEvent->getUserId())->getById($fsEvent->getNodeId()));
+					$node = $this->rootFolder->getUserFolder($fsEvent->getUserId())->getFirstNodeById($fsEvent->getNodeId());
 				} catch (\Exception $e) {
 					$this->logger->warning('Error retrieving node for fs event' . $e->getMessage(), [
 						'exception' => $e,

lib/BackgroundJobs/IndexerJob.php

@@ -191,7 +191,7 @@ protected function index(array $files): void {
 			// this includes files that are too large, locked, or not readable
 			$visitedQFiles[] = $queueFile;
 
-			$file = current($this->rootFolder->getById($queueFile->getFileId()));
+			$file = $this->rootFolder->getFirstNodeById($queueFile->getFileId());
 			if (!$file instanceof File) {
 				continue;
 			}

lib/Listener/FileListener.php

@@ -78,8 +78,8 @@ public function handle(Event $event): void {
 			}
 
 			if ($event instanceof CacheEntryInsertedEvent) {
-				$node = current($this->rootFolder->getById($event->getFileId()));
-				if ($node === false) {
+				$node = $this->rootFolder->getFirstNodeById($event->getFileId());
+				if ($node === null) {
 					return;
 				}
 				if ($node instanceof Folder) {
@@ -105,8 +105,8 @@ public function handle(Event $event): void {
 				if ($cacheEntry === false) {
 					return;
 				}
-				$node = current($this->rootFolder->getById($cacheEntry->getId()));
-				if ($node === false) {
+				$node = $this->rootFolder->getFirstNodeById($cacheEntry->getId());
+				if ($node === null) {
 					return;
 				}
 				// Synchronous, because we wouldn't have the recursive list of file ids after deletion

lib/Service/FsEventService.php

@@ -117,7 +117,7 @@ public function onInsert(Node $node, bool $recurse = true, bool $update = false)
 		}
 
 		foreach ($fileIds as $fileId) {
-			$file = current($this->rootFolder->getById($fileId));
+			$file = $this->rootFolder->getFirstNodeById($fileId);
 			if (!$file instanceof File) {
 				continue;
 			}