/**
* 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')
;
}
*/
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));
}
}