feat: Pass limit/offset for searchByTag

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Feb 27, 2024 · dfd21de · dfd21de
1 parent b230e54
commit dfd21de
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
@@ -343,7 +343,7 @@ protected function processFilterRulesForFileNodes(array $filterRules, ?int $limi
 		}
 
 		if ($this->hasFilterFavorites($filterRules)) {
-			$tmpNodes = $this->userFolder->searchByTag(ITags::TAG_FAVORITE, $this->userSession->getUser()->getUID());
+			$tmpNodes = $this->userFolder->searchByTag(ITags::TAG_FAVORITE, $this->userSession->getUser()->getUID(), $limit ?? 0, $offset ?? 0);
 			$nodes = $this->intersectNodes($nodes, $tmpNodes);
 			if ($nodes === []) {
 				// there cannot be a common match when nodes are empty early.

diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -495,7 +495,7 @@ public function testProcessFilterRulesSingle(): void {
 			->with('OneTwoThree')
 			->willReturn([$filesNode1, $filesNode2]);
 
-		$this->assertEquals([$filesNode1, $filesNode2], $this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, 0, 0]));
+		$this->assertEquals([$filesNode1, $filesNode2], $this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]));
 	}
 
 	public function testProcessFilterRulesAndCondition(): void {
@@ -934,11 +934,25 @@ public function testProcessFavoriteFilter(): void {
 			['name' => '{http://owncloud.org/ns}favorite', 'value' => '1'],
 		];
 
-		$this->privateTags->expects($this->once())
-			->method('getFavorites')
-			->willReturn(['456', '789']);
+		$filesNode1 = $this->createMock(File::class);
+		$filesNode1->expects($this->any())
+			->method('getId')
+			->willReturn(111);
+
+		$filesNode2 = $this->createMock(File::class);
+		$filesNode2->expects($this->any())
+			->method('getId')
+			->willReturn(222);
+
+		$this->userFolder->expects($this->exactly(1))
+			->method('searchByTag')
+			->with('_$!<Favorite>!$_')
+			->willReturn([
+				$filesNode2,
+				$filesNode1,
+			]);
 
-		$this->assertEquals(['456', '789'], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileIDs', [$rules])));
+		$this->assertEquals([$filesNode1, $filesNode2], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
 	}
 
 	public function filesBaseUriProvider() {

diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
@@ -295,8 +295,8 @@ public function searchByMime($mimetype) {
 	 * @param string $userId owner of the tags
 	 * @return Node[]
 	 */
-	public function searchByTag($tag, $userId) {
-		$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'tagname', $tag), $userId);
+	public function searchByTag($tag, $userId, int $limit = 0, int $offset = 0) {
+		$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'tagname', $tag), $userId, $limit, $offset);
 		return $this->search($query);
 	}
 

diff --git a/lib/private/Files/Node/LazyFolder.php b/lib/private/Files/Node/LazyFolder.php
@@ -480,7 +480,7 @@ public function searchByMime($mimetype) {
 	/**
 	 * @inheritDoc
 	 */
-	public function searchByTag($tag, $userId) {
+	public function searchByTag($tag, $userId, int $limit = 0, int $offset = 0) {
 		return $this->__call(__FUNCTION__, func_get_args());
 	}
 

diff --git a/lib/private/Files/Node/NonExistingFolder.php b/lib/private/Files/Node/NonExistingFolder.php
@@ -150,7 +150,7 @@ public function searchByMime($mimetype) {
 		throw new NotFoundException();
 	}
 
-	public function searchByTag($tag, $userId) {
+	public function searchByTag($tag, $userId, int $limit = 0, int $offset = 0) {
 		throw new NotFoundException();
 	}
 

diff --git a/lib/public/Files/Folder.php b/lib/public/Files/Folder.php
@@ -136,10 +136,12 @@ public function searchByMime($mimetype);
 	 *
 	 * @param string|int $tag tag name or tag id
 	 * @param string $userId owner of the tags
+	 * @param int $limit since 28.0.0
+	 * @param int $offset since 28.0.0
 	 * @return \OCP\Files\Node[]
 	 * @since 8.0.0
 	 */
-	public function searchByTag($tag, $userId);
+	public function searchByTag($tag, $userId, int $limit = 0, int $offset = 0);
 
 	/**
 	 * search for files by system tag