fix: Fix quirks introduced by backport conflicts

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · May 13, 2024 · 81c0fa2 · 81c0fa2
1 parent a300663
commit 81c0fa2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/Db/Poll.php b/lib/Db/Poll.php
@@ -209,7 +209,7 @@ public function jsonSerialize(): array {
 			'summary' => [
 				'userRole' => $this->getUserRole(),
 				'orphanedVotes' => $this->getCurrentUserCountOrphanedVotes(),
-				'yesVotes' => $this->getCurrentUserCountVotesYes(),
+				'yesByCurrentUser' => $this->getCurrentUserCountVotesYes(),
 				'countVotes' => $this->getCurrentUserCountVotes(),
 			],
 		];

diff --git a/lib/Db/PollMapper.php b/lib/Db/PollMapper.php
@@ -187,7 +187,6 @@ protected function buildQuery(): IQueryBuilder {
 
 		$this->joinOptionsForMaxDate($qb, self::TABLE);
 		$this->joinUserRole($qb, self::TABLE, $currentUserId);
-		$qb->groupBy(self::TABLE . '.id');
 
 		return $qb;
 	}