public function getBuilderForArchiveByUser($userId)
{
return $this
- ->getSortedQueryBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId, 'archivedAt', 'desc')
->andWhere('e.isArchived = true')
;
}
*/
public function getBuilderForUntaggedByUser($userId)
{
- return $this
- ->sortQueryBuilder($this->getRawBuilderForUntaggedByUser($userId));
+ return $this->sortQueryBuilder($this->getRawBuilderForUntaggedByUser($userId));
}
/**
*
* @return Pagerfanta
*/
- public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'ASC', $since = 0, $tags = '')
+ public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'asc', $since = 0, $tags = '')
{
$qb = $this->createQueryBuilder('e')
->leftJoin('e.tags', 't')
}
}
+ if (!\in_array(strtolower($order), ['asc', 'desc'], true)) {
+ throw new \Exception('Order "' . $order . '" parameter is wrong, allowed: asc or desc');
+ }
+
if ('created' === $sort) {
$qb->orderBy('e.id', $order);
} elseif ('updated' === $sort) {
$qb->orderBy('e.updatedAt', $order);
+ } elseif ('archived' === $sort) {
+ $qb->orderBy('e.archivedAt', $order);
}
$pagerAdapter = new DoctrineORMAdapter($qb, true, false);
->getResult();
}
+ /**
+ * Returns a random entry, filtering by status.
+ *
+ * @param $userId
+ * @param string $status can be unread, archive or starred
+ *
+ * @throws \Doctrine\ORM\NoResultException
+ * @throws \Doctrine\ORM\NonUniqueResultException
+ *
+ * @return Entry
+ */
+ public function getRandomEntry($userId, $status = '')
+ {
+ $max = $this->getEntityManager()
+ ->createQuery('SELECT MAX(e.id) FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.user = :userId')
+ ->setParameter('userId', $userId)
+ ->getSingleScalarResult();
+
+ $qb = $this->createQueryBuilder('e')
+ ->where('e.user = :user_id')->setParameter('user_id', $userId);
+
+ if ('unread' === $status) {
+ $qb->andWhere('e.isArchived = false');
+ }
+
+ if ('archive' === $status) {
+ $qb->andWhere('e.isArchived = true');
+ }
+
+ if ('starred' === $status) {
+ $qb->andWhere('e.isStarred = true');
+ }
+
+ return $qb->andWhere('e.id >= :rand')
+ ->setParameter('rand', rand(0, $max))
+ ->setMaxResults(1)
+ ->getQuery()
+ ->getSingleResult();
+ }
+
/**
* Return a query builder to be used by other getBuilderFor* method.
*
*/
private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc')
{
- return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId));
+ return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction);
}
/**
*/
private function sortQueryBuilder(QueryBuilder $qb, $sortBy = 'createdAt', $direction = 'desc')
{
- return $qb
- ->orderBy(sprintf('e.%s', $sortBy), $direction);
+ return $qb->orderBy(sprintf('e.%s', $sortBy), $direction);
}
}