public function getBuilderForArchiveByUser($userId)
{
return $this
- ->getSortedQueryBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId, 'archivedAt', 'desc')
->andWhere('e.isArchived = true')
;
}
}
/**
- * Retrieves untagged entries for a user.
+ * Retrieve a sorted list of untagged entries for a user.
*
* @param int $userId
*
*/
public function getBuilderForUntaggedByUser($userId)
{
- return $this
- ->getSortedQueryBuilderByUser($userId)
- ->andWhere('size(e.tags) = 0');
+ return $this->sortQueryBuilder($this->getRawBuilderForUntaggedByUser($userId));
+ }
+
+ /**
+ * Retrieve untagged entries for a user.
+ *
+ * @param int $userId
+ *
+ * @return QueryBuilder
+ */
+ public function getRawBuilderForUntaggedByUser($userId)
+ {
+ return $this->getQueryBuilderByUser($userId)
+ ->leftJoin('e.tags', 't')
+ ->andWhere('t.id is null');
}
/**
*
* @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
+ *
+ * @see https://github.com/doctrine/doctrine2/issues/5479#issuecomment-403862934
+ *
+ * @return Entry
+ */
+ public function getRandomEntry($userId, $status = '')
+ {
+ $qb = $this->getQueryBuilderByUser($userId)
+ ->select('MIN(e.id)', 'MAX(e.id)');
+
+ if ('unread' === $status) {
+ $qb->andWhere('e.isArchived = false');
+ }
+
+ if ('archive' === $status) {
+ $qb->andWhere('e.isArchived = true');
+ }
+
+ if ('starred' === $status) {
+ $qb->andWhere('e.isStarred = true');
+ }
+
+ 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)
+ ->setMaxResults(1)
+ ->getQuery()
+ ->getSingleResult();
+ }
+
/**
* Return a query builder to be used by other getBuilderFor* method.
*
- * @param int $userId
+ * @param int $userId
*
* @return QueryBuilder
*/
*/
private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc')
{
- return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId));
+ return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction);
}
/**
- * Return the given QueryBuilder with an orderBy() call
- *
+ * Return the given QueryBuilder with an orderBy() call.
+ *
* @param QueryBuilder $qb
- * @param string $sortBy
- * @param string $direction
+ * @param string $sortBy
+ * @param string $direction
*
* @return QueryBuilder
*/
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);
}
}