fix(trashbin): Fix n+1 issue in propfind in trash root

CustomPropertiesBackend is already able to cache the custom properties
of a folder content. But the trash root is not a Directory but instead
just a ICollection, so extend CacheEntry to also handle a TrashEntry.

Signed-off-by: Carl Schwan <carl.schwan@nextclound.com>

Author: Carl Schwan

apps/dav/lib/DAV/CustomPropertiesBackend.php

@@ -13,6 +13,7 @@
 use OCA\DAV\CalDAV\DefaultCalendarValidator;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\FilesPlugin;
+use OCA\Files_Trashbin\Sabre\TrashRoot;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
@@ -220,7 +221,7 @@ public function propFind($path, PropFind $propFind) {
 		}
 
 		$node = $this->tree->getNodeForPath($path);
-		if ($node instanceof Directory && $propFind->getDepth() !== 0) {
+		if (($node instanceof Directory || $node instanceof TrashRoot) && $propFind->getDepth() !== 0) {
 			$this->cacheDirectory($path, $node);
 		}
 
@@ -344,18 +345,22 @@ private function getPublishedProperties(string $path, array $requestedProperties
 	/**
 	 * prefetch all user properties in a directory
 	 */
-	private function cacheDirectory(string $path, Directory $node): void {
+	private function cacheDirectory(string $path, Directory|TrashRoot $node): void {
+		$internalNode = $node->getNode();
+		if (!$internalNode) {
+			return;
+		}
+
 		$prefix = ltrim($path . '/', '/');
 		$query = $this->connection->getQueryBuilder();
 		$query->select('name', 'p.propertypath', 'p.propertyname', 'p.propertyvalue', 'p.valuetype')
 			->from('filecache', 'f')
-			->hintShardKey('storage', $node->getNode()->getMountPoint()->getNumericStorageId())
+			->hintShardKey('storage', $internalNode->getMountPoint()->getNumericStorageId())
 			->leftJoin('f', 'properties', 'p', $query->expr()->eq('p.propertypath', $query->func()->concat(
 				$query->createNamedParameter($prefix),
 				'f.name'
-			)),
-			)
-			->where($query->expr()->eq('parent', $query->createNamedParameter($node->getInternalFileId(), IQueryBuilder::PARAM_INT)))
+			)))
+			->where($query->expr()->eq('parent', $query->createNamedParameter($internalNode->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->orX(
 				$query->expr()->eq('p.userid', $query->createNamedParameter($this->user->getUID())),
 				$query->expr()->isNull('p.userid'),

apps/files_trashbin/lib/Sabre/TrashRoot.php

@@ -13,7 +13,12 @@
 use OCA\Files_Trashbin\Trash\ITrashManager;
 use OCA\Files_Trashbin\Trashbin;
 use OCP\Files\FileInfo;
+use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\IUser;
+use OCP\Server;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\ICollection;
@@ -90,4 +95,26 @@ public function childExists($name): bool {
 	public function getLastModified(): int {
 		return 0;
 	}
+
+	public function getNode(): ?Folder {
+		static $trashFilesRoot = null;
+		if ($trashFilesRoot === null) {
+			$rootFolder = Server::get(IRootFolder::class);
+			$userRoot = $rootFolder->getUserFolder($this->user->getUID())->getParent();
+			try {
+				/** @var Folder $trashRoot */
+				$trashRoot = $userRoot->get('files_trashbin');
+				/** @var Folder $trashFilesRoot */
+				$trashFilesRoot = $trashRoot->get('files');
+			} catch (NotFoundException|NotPermittedException) {
+				return null;
+			}
+		}
+
+		return $trashFilesRoot;
+	}
+
+	public function getInternalFileId() {
+		return $this->getNode()->getId();
+	}
 }