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,7 +13,9 @@
 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\Files\Folder;
 use OCP\IDBConnection;
 use OCP\IUser;
 use Sabre\DAV\Exception as DavException;
@@ -220,10 +222,16 @@ public function propFind($path, PropFind $propFind) {
 		}
 
 		$node = $this->tree->getNodeForPath($path);
-		if ($node instanceof Directory && $propFind->getDepth() !== 0) {
-			$this->cacheDirectory($path, $node);
+		if (($node instanceof Directory) && $propFind->getDepth() !== 0) {
+			$this->cacheDirectory($path, $node->getNode());
+		} else if ($node instanceof TrashRoot) {
+			$trashNodes = $node->getTrashRoots();
+			foreach ($trashNodes as $trashNode) {
+				$this->cacheDirectory($path, $trashNode);
+			}
 		}
 
+
 		// First fetch the published properties (set by another user), then get the ones set by
 		// the current user. If both are set then the latter as priority.
 		foreach ($this->getPublishedProperties($path, $requestedProps) as $propName => $propValue) {
@@ -344,18 +352,17 @@ 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, Folder $node): void {
 		$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', $node->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($node->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,12 +13,18 @@
 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;
 
 class TrashRoot implements ICollection {
+	private ?Folder $trashFilesRoot = null;
 
 	public function __construct(
 		private IUser $user,
@@ -90,4 +96,11 @@ public function childExists($name): bool {
 	public function getLastModified(): int {
 		return 0;
 	}
+
+	/**
+	 * @return Folder[]
+	 */
+	public function getTrashRoots(): array {
+		return $this->trashManager->getTrashRootsForUser($this->user);
+	}
 }

apps/files_trashbin/lib/Trash/ITrashBackend.php

@@ -6,6 +6,7 @@
  */
 namespace OCA\Files_Trashbin\Trash;
 
+use OCP\Files\Folder;
 use OCP\Files\Node;
 use OCP\Files\Storage\IStorage;
 use OCP\IUser;
@@ -64,4 +65,10 @@ public function moveToTrash(IStorage $storage, string $internalPath): bool;
 	 * @return Node|null
 	 */
 	public function getTrashNodeById(IUser $user, int $fileId);
+
+	/**
+	 * @return Folder[]
+	 * @since 32.0.0
+	 */
+	public function getTrashRootsForUser(IUser $user): array;
 }

apps/files_trashbin/lib/Trash/ITrashManager.php

@@ -38,4 +38,9 @@ public function pauseTrash();
 	 * @since 15.0.0
 	 */
 	public function resumeTrash();
+
+	/**
+	 * @since 32.0.0
+	 */
+	public function getTrashRootsForUser(IUser $user): array;
 }

apps/files_trashbin/lib/Trash/LegacyTrashBackend.php

@@ -118,4 +118,9 @@ public function getTrashNodeById(IUser $user, int $fileId) {
 			return null;
 		}
 	}
+
+	public function getTrashRootsForUser(IUser $user): array {
+		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
+		return [$userFolder->getParent()->get('files_trashbin/files')];
+	}
 }

apps/files_trashbin/lib/Trash/TrashManager.php

@@ -108,4 +108,10 @@ public function pauseTrash() {
 	public function resumeTrash() {
 		$this->trashPaused = false;
 	}
+
+	public function getTrashRootsForUser(IUser $user): array {
+		return array_reduce($this->getBackends(), function (array $items, ITrashBackend $backend) use ($user) {
+			return array_merge($items, $backend->getTrashRootsForUser($user));
+		}, []);
+	}
 }