mirror of
https://github.com/wallabag/wallabag.git
synced 2025-06-05 15:08:47 +00:00
Better random function
This commit is contained in:
parent
0447a75b06
commit
062fad434a
1 changed files with 13 additions and 9 deletions
|
@ -440,17 +440,14 @@ class EntryRepository extends EntityRepository
|
||||||
* @throws \Doctrine\ORM\NoResultException
|
* @throws \Doctrine\ORM\NoResultException
|
||||||
* @throws \Doctrine\ORM\NonUniqueResultException
|
* @throws \Doctrine\ORM\NonUniqueResultException
|
||||||
*
|
*
|
||||||
|
* @see https://github.com/doctrine/doctrine2/issues/5479#issuecomment-403862934
|
||||||
|
*
|
||||||
* @return Entry
|
* @return Entry
|
||||||
*/
|
*/
|
||||||
public function getRandomEntry($userId, $status = '')
|
public function getRandomEntry($userId, $status = '')
|
||||||
{
|
{
|
||||||
$max = $this->getEntityManager()
|
$qb = $this->getQueryBuilderByUser($userId)
|
||||||
->createQuery('SELECT MAX(e.id) FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.user = :userId')
|
->select('MIN(e.id)', 'MAX(e.id)');
|
||||||
->setParameter('userId', $userId)
|
|
||||||
->getSingleScalarResult();
|
|
||||||
|
|
||||||
$qb = $this->createQueryBuilder('e')
|
|
||||||
->where('e.user = :user_id')->setParameter('user_id', $userId);
|
|
||||||
|
|
||||||
if ('unread' === $status) {
|
if ('unread' === $status) {
|
||||||
$qb->andWhere('e.isArchived = false');
|
$qb->andWhere('e.isArchived = false');
|
||||||
|
@ -469,8 +466,15 @@ class EntryRepository extends EntityRepository
|
||||||
$qb->andWhere('t.id is null');
|
$qb->andWhere('t.id is null');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $qb->andWhere('e.id >= :rand')
|
$idLimits = $qb
|
||||||
->setParameter('rand', rand(0, $max))
|
->getQuery()
|
||||||
|
->getOneOrNullResult();
|
||||||
|
$randomPossibleIds = rand($idLimits[1], $idLimits[2]);
|
||||||
|
|
||||||
|
return $qb
|
||||||
|
->select('e')
|
||||||
|
->andWhere('e.id >= :random_id')
|
||||||
|
->setParameter('random_id', $randomPossibleIds)
|
||||||
->setMaxResults(1)
|
->setMaxResults(1)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getSingleResult();
|
->getSingleResult();
|
||||||
|
|
Loading…
Reference in a new issue