fix PollMapper for PostgreSQL usage

lib/Db/CommentMapper.php

@@ -100,17 +100,10 @@ protected function buildQuery(): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-			->from($this->getTableName(), self::TABLE);
-		$anonAlias = $this->joinAnon($qb, self::TABLE);
-
-		$qb->groupBy(
-			self::TABLE . '.id',
-			$anonAlias . '.anonymous',
-			$anonAlias . '.owner',
-			$anonAlias . '.show_results',
-			$anonAlias . '.expire',
-		);
-
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id');
+
+		$this->joinAnon($qb, self::TABLE);
 		return $qb;
 	}
 }

lib/Db/OptionMapper.php

@@ -175,21 +175,16 @@ protected function buildQuery(bool $hideVotes = false): IQueryBuilder {
 
 		$qb->select(self::TABLE . '.*')
 			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id')
 			->orderBy('order', 'ASC');
 
+
 		$this->joinVotesCount($qb, self::TABLE, $hideVotes);
 		$this->joinPollForLimits($qb, self::TABLE);
 		$this->joinCurrentUserVote($qb, self::TABLE, $currentUserId);
 		$this->joinCurrentUserVoteCount($qb, self::TABLE, $currentUserId);
-		$anonAlias = $this->joinAnon($qb, self::TABLE);
-
-		$qb->groupBy(
-			self::TABLE . '.id',
-			$anonAlias . '.anonymous',
-			$anonAlias . '.owner',
-			$anonAlias . '.show_results',
-			$anonAlias . '.expire',
-		);
+		$this->joinAnon($qb, self::TABLE);
+
 
 		return $qb;
 	}

lib/Db/PollMapper.php

@@ -174,13 +174,13 @@ protected function buildQuery(): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-			// TODO: check if this is necessary, in case of empty table to avoid possibly nulled columns
-			// ->groupBy(self::TABLE . '.id')
-			->from($this->getTableName(), self::TABLE);
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id');
+
+
 		$this->joinOptionsForMaxDate($qb, self::TABLE);
 		$this->joinCurrentUserVotes($qb, self::TABLE, $currentUserId);
 		$this->joinUserRole($qb, self::TABLE, $currentUserId);
-		$qb->groupBy(self::TABLE . '.id');
 		return $qb;
 	}
 
@@ -192,8 +192,13 @@ protected function buildQuery(): IQueryBuilder {
 	 */
 	protected function joinUserRole(IQueryBuilder &$qb, string $fromAlias, string $currentUserId): void {
 		$joinAlias = 'shares';
-		$qb->addSelect($qb->createFunction('coalesce(' . $joinAlias . '.type, "") AS user_role'));
-		$qb->selectAlias($joinAlias . '.locked', 'is_current_user_locked');
+		$emptyString = $qb->createNamedParameter("", IQueryBuilder::PARAM_STR);
+
+		$qb->addSelect($qb->createFunction('coalesce(' . $joinAlias . '.type, '. $emptyString . ') AS user_role'))
+			->addGroupBy($joinAlias . '.type');
+
+		$qb->selectAlias($joinAlias . '.locked', 'is_current_user_locked')
+			->addGroupBy($joinAlias . '.locked');
 
 		$qb->leftJoin(
 			$fromAlias,
@@ -205,6 +210,7 @@ protected function joinUserRole(IQueryBuilder &$qb, string $fromAlias, string $c
 				$qb->expr()->eq($joinAlias . '.deleted', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)),
 			)
 		);
+
 	}
 
 	/**
@@ -215,9 +221,11 @@ protected function joinUserRole(IQueryBuilder &$qb, string $fromAlias, string $c
 	 */
 	protected function joinOptionsForMaxDate(IQueryBuilder &$qb, string $fromAlias): void {
 		$joinAlias = 'options';
-		$saveMin = (string) time();
 
-		$qb->addSelect($qb->createFunction('coalesce(MAX(' . $joinAlias . '.timestamp), 0) AS max_date'))
+		$zero = $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT);
+		$saveMin = $qb->createNamedParameter(time(), IQueryBuilder::PARAM_INT);
+
+		$qb->addSelect($qb->createFunction('coalesce(MAX(' . $joinAlias . '.timestamp), '. $zero  . ') AS max_date'))
 			->addSelect($qb->createFunction('coalesce(MIN(' . $joinAlias . '.timestamp), ' . $saveMin . ') AS min_date'));
 
 		$qb->leftJoin(

lib/Db/Preferences.php

@@ -70,7 +70,7 @@ public function __construct() {
 	}
 
 	public function getPreferences_decoded(): mixed {
-		return json_decode($this->getPreferences());
+		return json_decode($this->getPreferences() ?? '');
 	}
 
 	/**

lib/Db/QBMapperWithUser.php

@@ -50,21 +50,26 @@ public function __construct(
 	/**
 	 * Joins anonymous setting of poll
 	 */
-	protected function joinAnon(IQueryBuilder &$qb, string $fromAlias): string {
+	protected function joinAnon(IQueryBuilder &$qb, string $fromAlias): void {
 		$joinAlias = 'anon';
 
 		$qb->selectAlias($joinAlias . '.anonymous', 'anonymized')
 			->selectAlias($joinAlias . '.owner', 'poll_owner_id')
 			->selectAlias($joinAlias . '.show_results', 'poll_show_results')
 			->selectAlias($joinAlias . '.expire', 'poll_expire')
-		;
+			->addGroupBy(
+				$joinAlias . '.anonymous',
+				$joinAlias . '.owner',
+				$joinAlias . '.show_results',
+				$joinAlias . '.expire',
+			);
 
 		$qb->leftJoin(
 			$fromAlias,
 			Poll::TABLE,
 			$joinAlias,
 			$qb->expr()->eq($joinAlias . '.id', $fromAlias . '.poll_id'),
 		);
-		return $joinAlias;
+
 	}
 }

lib/Db/ShareMapper.php

@@ -58,7 +58,7 @@ public function findByPoll(int $pollId, bool $getDeleted = false): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
 			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)));
 
@@ -80,7 +80,7 @@ public function findGroupShareByPoll(int $pollId, bool $getDeleted = false): arr
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
 			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq(self::TABLE . '.type', $qb->createNamedParameter(Share::TYPE_GROUP, IQueryBuilder::PARAM_STR)));
@@ -141,7 +141,8 @@ public function findByPollAndUser(int $pollId, string $userId, bool $findDeleted
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq(self::TABLE . '.user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
 			->andWhere($qb->expr()->isNotNull(self::TABLE . '.id'));
@@ -165,7 +166,8 @@ public function findByToken(string $token, bool $getDeleted = false): Share {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.token', $qb->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
 
 		if (!$getDeleted) {
@@ -223,8 +225,6 @@ protected function joinUserVoteCount(IQueryBuilder &$qb, string $fromAlias): voi
 				$qb->expr()->eq($fromAlias . '.user_id', $joinAlias . '.user_id'),
 			)
 		);
-		// avoid result with nulled columns
-		$qb->groupBy($fromAlias . '.id');
 	}
 
 }

lib/Db/VoteMapper.php

@@ -117,10 +117,10 @@ public function findParticipantsByPoll(int $pollId): array {
 
 		$qb->selectDistinct([self::TABLE . '.user_id', self::TABLE . '.poll_id'])
 			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.user_id', self::TABLE . '.poll_id')
 			->where(
 				$qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT))
 			);
-		$qb->addGroupBy(self::TABLE . '.user_id', self::TABLE . '.poll_id');
 
 		return $this->findEntities($qb);
 	}
@@ -197,28 +197,20 @@ protected function find(int $id): Vote {
 
 	protected function buildQuery(bool $findOrphaned = false): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
-
+		
 		$qb->select(self::TABLE . '.*')
-			->from($this->getTableName(), self::TABLE);
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id');
 
 		$optionAlias = $this->joinOption($qb, self::TABLE);
 
-
 		if ($findOrphaned) {
 			$qb->where($qb->expr()->isNull($optionAlias . '.id'));
 		} else {
 			$qb->where($qb->expr()->isNotNull($optionAlias . '.id'));
 		}
-		$anonAlias = $this->joinAnon($qb, self::TABLE);
-
-		$qb->groupBy(
-			self::TABLE . '.id',
-			$optionAlias . '.id',
-			$anonAlias . '.anonymous',
-			$anonAlias . '.owner',
-			$anonAlias . '.show_results',
-			$anonAlias . '.expire',
-		);
+		$this->joinAnon($qb, self::TABLE);
+
 
 		return $qb;
 	}
@@ -230,7 +222,8 @@ protected function buildQuery(bool $findOrphaned = false): IQueryBuilder {
 	protected function joinOption(IQueryBuilder &$qb, string $fromAlias): string {
 		$joinAlias = 'options';
 
-		$qb->selectAlias($joinAlias . '.id', 'option_id');
+		$qb->selectAlias($joinAlias . '.id', 'option_id')
+			->addGroupBy($joinAlias . '.id');
 
 		$qb->leftJoin(
 			$fromAlias,

tests/Unit/Db/PollMapperTest.php

@@ -69,6 +69,15 @@ public function testUpdate() {
 		unset($poll);
 	}
 
+	/**
+	 * Delete the previously created entry from the database.
+	 */
+	public function testFind() {
+		foreach ($this->polls as $poll) {
+			$this->assertInstanceOf(Poll::class, $this->pollMapper->find($poll->getId()));
+		}
+	}
+
 	/**
 	 * Delete the previously created entry from the database.
 	 */