public function getBuilderForAllByUser($userId)
{
return $this
- ->getBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId)
;
}
public function getBuilderForUnreadByUser($userId)
{
return $this
- ->getBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId)
->andWhere('e.isArchived = false')
;
}
public function getBuilderForArchiveByUser($userId)
{
return $this
- ->getBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId)
->andWhere('e.isArchived = true')
;
}
public function getBuilderForStarredByUser($userId)
{
return $this
- ->getBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId, 'starredAt', 'desc')
->andWhere('e.isStarred = true')
;
}
public function getBuilderForSearchByUser($userId, $term, $currentRoute)
{
$qb = $this
- ->getBuilderByUser($userId);
+ ->getSortedQueryBuilderByUser($userId);
if ('starred' === $currentRoute) {
$qb->andWhere('e.isStarred = 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
- ->getBuilderByUser($userId)
- ->andWhere('size(e.tags) = 0');
+ ->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');
}
/**
{
$qb = $this->createQueryBuilder('e')
->leftJoin('e.tags', 't')
- ->where('e.user =:userId')->setParameter('userId', $userId);
+ ->where('e.user = :userId')->setParameter('userId', $userId);
if (null !== $isArchived) {
$qb->andWhere('e.isArchived = :isArchived')->setParameter('isArchived', (bool) $isArchived);
$qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since)));
}
- if ('' !== $tags) {
- foreach (explode(',', $tags) as $tag) {
- $qb->andWhere('t.label = :label')->setParameter('label', $tag);
+ if (\is_string($tags) && '' !== $tags) {
+ foreach (explode(',', $tags) as $i => $tag) {
+ $entryAlias = 'e' . $i;
+ $tagAlias = 't' . $i;
+
+ // Complexe queries to ensure multiple tags are associated to an entry
+ // https://stackoverflow.com/a/6638146/569101
+ $qb->andWhere($qb->expr()->in(
+ 'e.id',
+ $this->createQueryBuilder($entryAlias)
+ ->select($entryAlias . '.id')
+ ->leftJoin($entryAlias . '.tags', $tagAlias)
+ ->where($tagAlias . '.label = :label' . $i)
+ ->getDQL()
+ ));
+
+ // bound parameter to the main query builder
+ $qb->setParameter('label' . $i, $tag);
}
}
->innerJoin('e.tags', 't')
->innerJoin('e.user', 'u')
->addSelect('t', 'u')
- ->where('e.user=:userId')->setParameter('userId', $userId)
+ ->where('e.user = :userId')->setParameter('userId', $userId)
;
return $qb->getQuery()->getResult();
*/
public function removeTag($userId, Tag $tag)
{
- $entries = $this->getBuilderByUser($userId)
+ $entries = $this->getSortedQueryBuilderByUser($userId)
->innerJoin('e.tags', 't')
->andWhere('t.id = :tagId')->setParameter('tagId', $tag->getId())
->getQuery()
*/
public function findAllByTagId($userId, $tagId)
{
- return $this->getBuilderByUser($userId)
+ return $this->getSortedQueryBuilderByUser($userId)
->innerJoin('e.tags', 't')
->andWhere('t.id = :tagId')->setParameter('tagId', $tagId)
->getQuery()
->getQuery()
->getResult();
- if (count($res)) {
+ if (\count($res)) {
return current($res);
}
{
$qb = $this->createQueryBuilder('e')
->select('count(e)')
- ->where('e.user=:userId')->setParameter('userId', $userId)
+ ->where('e.user = :userId')->setParameter('userId', $userId)
;
return (int) $qb->getQuery()->getSingleScalarResult();
* Get id and url from all entries
* Used for the clean-duplicates command.
*/
- public function getAllEntriesIdAndUrl($userId)
+ public function findAllEntriesIdAndUrlByUserId($userId)
{
$qb = $this->createQueryBuilder('e')
->select('e.id, e.url')
}
/**
- * Return a query builder to used by other getBuilderFor* method.
+ * Return a query builder to be used by other getBuilderFor* method.
*
* @param int $userId
*
* @return QueryBuilder
*/
- private function getBuilderByUser($userId)
+ private function getQueryBuilderByUser($userId)
{
return $this->createQueryBuilder('e')
- ->andWhere('e.user = :userId')->setParameter('userId', $userId)
- ->orderBy('e.createdAt', 'desc')
- ;
+ ->andWhere('e.user = :userId')->setParameter('userId', $userId);
+ }
+
+ /**
+ * Return a sorted query builder to be used by other getBuilderFor* method.
+ *
+ * @param int $userId
+ * @param string $sortBy
+ * @param string $direction
+ *
+ * @return QueryBuilder
+ */
+ private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc')
+ {
+ return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction);
+ }
+
+ /**
+ * Return the given QueryBuilder with an orderBy() call.
+ *
+ * @param QueryBuilder $qb
+ * @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);
}
}