/**
* Retrieves all entries for a user.
*
- * @param int $userId
+ * @param int $userId
+ * @param string $sortBy Field to sort
+ * @param string $direction Direction of the order
*
* @return QueryBuilder
*/
- public function getBuilderForAllByUser($userId)
+ public function getBuilderForAllByUser($userId, $sortBy = 'id', $direction = 'DESC')
{
+ $sortBy = $sortBy ?: 'id';
+
return $this
- ->getSortedQueryBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId, $sortBy, $direction)
;
}
/**
* Retrieves unread entries for a user.
*
- * @param int $userId
+ * @param int $userId
+ * @param string $sortBy Field to sort
+ * @param string $direction Direction of the order
*
* @return QueryBuilder
*/
- public function getBuilderForUnreadByUser($userId)
+ public function getBuilderForUnreadByUser($userId, $sortBy = 'id', $direction = 'DESC')
{
+ $sortBy = $sortBy ?: 'id';
+
return $this
- ->getSortedQueryBuilderByUser($userId)
+ ->getSortedQueryBuilderByUser($userId, $sortBy, $direction)
->andWhere('e.isArchived = false')
;
}
/**
* Retrieves read entries for a user.
*
- * @param int $userId
+ * @param int $userId
+ * @param string $sortBy Field to sort
+ * @param string $direction Direction of the order
*
* @return QueryBuilder
*/
- public function getBuilderForArchiveByUser($userId)
+ public function getBuilderForArchiveByUser($userId, $sortBy = 'archivedAt', $direction = 'DESC')
{
+ $sortBy = $sortBy ?: 'archivedAt';
+
return $this
- ->getSortedQueryBuilderByUser($userId, 'archivedAt', 'desc')
+ ->getSortedQueryBuilderByUser($userId, $sortBy, $direction)
->andWhere('e.isArchived = true')
;
}
/**
* Retrieves starred entries for a user.
*
- * @param int $userId
+ * @param int $userId
+ * @param string $sortBy Field to sort
+ * @param string $direction Direction of the order
*
* @return QueryBuilder
*/
- public function getBuilderForStarredByUser($userId)
+ public function getBuilderForStarredByUser($userId, $sortBy = 'starredAt', $direction = 'DESC')
{
+ $sortBy = $sortBy ?: 'starredAt';
+
return $this
- ->getSortedQueryBuilderByUser($userId, 'starredAt', 'desc')
+ ->getSortedQueryBuilderByUser($userId, $sortBy, $direction)
->andWhere('e.isStarred = true')
;
}
->andWhere('t.id is null');
}
+ /**
+ * Retrieve the number of untagged entries for a user.
+ *
+ * @param int $userId
+ *
+ * @return int
+ */
+ public function countUntaggedEntriesByUser($userId)
+ {
+ return (int) $this->getRawBuilderForUntaggedByUser($userId)
+ ->select('count(e.id)')
+ ->getQuery()
+ ->getSingleScalarResult();
+ }
+
/**
* Find Entries.
*
* DELETE et FROM entry_tag et WHERE et.entry_id IN ( SELECT e.id FROM entry e WHERE e.user_id = :userId ) AND et.tag_id = :tagId
*
* @param int $userId
- * @param Tag $tag
*/
public function removeTag($userId, Tag $tag)
{
* @param string $url
* @param int $userId
*
- * @return Entry|bool
+ * @return Entry|false
*/
public function findByUrlAndUserId($url, $userId)
{
* @param string $hashedUrl Url hashed using sha1
* @param int $userId
*
- * @return Entry|bool
+ * @return Entry|false
*/
public function findByHashedUrlAndUserId($hashedUrl, $userId)
{
+ // try first using hashed_url (to use the database index)
$res = $this->createQueryBuilder('e')
->where('e.hashedUrl = :hashed_url')->setParameter('hashed_url', $hashedUrl)
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
return current($res);
}
+ // then try using hashed_given_url (to use the database index)
+ $res = $this->createQueryBuilder('e')
+ ->where('e.hashedGivenUrl = :hashed_given_url')->setParameter('hashed_given_url', $hashedUrl)
+ ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
+ ->getQuery()
+ ->getResult();
+
+ if (\count($res)) {
+ return current($res);
+ }
+
return false;
}
/**
* 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);
+ // in case one of these isn't defined, don't apply the orderBy
+ if (!$sortBy || !$direction) {
+ return $qb;
+ }
+
+ return $qb->orderBy(sprintf('e.%s', $sortBy), strtoupper($direction));
}
}