- return $qb->andWhere('e.id >= :rand')
- ->setParameter('rand', rand(0, $max))
+ if ('untagged' === $status) {
+ $qb->leftJoin('e.tags', 't');
+ $qb->andWhere('t.id is null');
+ }
+
+ $idLimits = $qb
+ ->getQuery()
+ ->getOneOrNullResult();
+ $randomPossibleIds = rand($idLimits[1], $idLimits[2]);
+
+ return $qb
+ ->select('e')
+ ->andWhere('e.id >= :random_id')
+ ->setParameter('random_id', $randomPossibleIds)