Merge branch 'issue-581-fix-postgres-sharing'

Signed-off-by: binsky <[email protected]>
nextcloud · Jun 25, 2023 · 04c2d27 · 04c2d27
2 parents b4f6ec0 + 3cfb3bd
commit 04c2d27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/Db/ShareRequestMapper.php b/lib/Db/ShareRequestMapper.php
@@ -74,15 +74,14 @@ public function getRequestByItemAndVaultGuid(string $item_guid, string $target_v
 	 * @return Entity[]
 	 * @throws Exception
 	 */
-	public function getRequestsByItemGuidGroupedByUser(string $item_guid) {
+	public function getRequestsByItemGuid(string $item_guid) {
 		if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
 			$this->db->executeQuery("SET sql_mode = '';");
 		}
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq('item_guid', $qb->createNamedParameter($item_guid, IQueryBuilder::PARAM_STR)))
-			->groupBy('target_user_id');
+			->where($qb->expr()->eq('item_guid', $qb->createNamedParameter($item_guid, IQueryBuilder::PARAM_STR)));
 
 		return $this->findEntities($qb);
 	}

diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
@@ -290,7 +290,7 @@ public function getVaultAclList(string $user_id, string $vault_guid) {
 	 * @throws Exception
 	 */
 	public function getCredentialPendingAclList(string $item_guid) {
-		return $this->shareRequest->getRequestsByItemGuidGroupedByUser($item_guid);
+		return $this->shareRequest->getRequestsByItemGuid($item_guid);
 	}
 
 	/**

diff --git a/tests/unit/lib/Db/ShareRequestMapperTest.php b/tests/unit/lib/Db/ShareRequestMapperTest.php
@@ -112,7 +112,7 @@ public function testCreateRequest() {
 	}
 
 	/**
-	 * @covers ::getRequestsByItemGuidGroupedByUser
+	 * @covers ::getRequestsByItemGuid
 	 */
 	public function testGetRequestsByItemGuidGroupedByUser() {
 		$dataset = $this->findInDataset(
@@ -121,7 +121,7 @@ public function testGetRequestsByItemGuidGroupedByUser() {
 			$this->dataset->getRow(0)['item_guid']
 		);
 
-		$result = $this->mapper->getRequestsByItemGuidGroupedByUser($dataset[0]['item_guid']);
+		$result = $this->mapper->getRequestsByItemGuid($dataset[0]['item_guid']);
 
 		$this->assertCount(count($dataset), $result);