mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-02 20:12:27 +00:00
Code Issues Projects Releases Wiki Activity

EntryRepository: refactor getBuilderByUser

Browse source 
We refactor getBuilderByUser to separate QueryBuilder getter and the
orderBy(). The previous code of getBuilderByUser() has been moved to
getSortedQueryBuilderByUser(). getBuildByUser() now returns a
QueryBuilder without the call to orderBy().

A new method named sortQueryBuilder() returns a given QueryBuilder with
an orderBy() call using given sort parameters.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2018-09-02 17:34:30 +02:00
parent 69b563948d
commit b7c5fda512
1 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View file

@ -21,7 +21,7 @@ class EntryRepository extends EntityRepository
public function getBuilderForAllByUser($userId) public function getBuilderForAllByUser($userId)
{ {
return $this return $this
->getBuilderByUser($userId) ->getSortedQueryBuilderByUser($userId)
; ;
} }
@ -35,7 +35,7 @@ class EntryRepository extends EntityRepository
public function getBuilderForUnreadByUser($userId) public function getBuilderForUnreadByUser($userId)
{ {
return $this return $this
->getBuilderByUser($userId) ->getSortedQueryBuilderByUser($userId)
->andWhere('e.isArchived = false') ->andWhere('e.isArchived = false')
; ;
} }
@ -50,7 +50,7 @@ class EntryRepository extends EntityRepository
public function getBuilderForArchiveByUser($userId) public function getBuilderForArchiveByUser($userId)
{ {
return $this return $this
->getBuilderByUser($userId) ->getSortedQueryBuilderByUser($userId)
->andWhere('e.isArchived = true') ->andWhere('e.isArchived = true')
; ;
} }
@ -65,7 +65,7 @@ class EntryRepository extends EntityRepository
public function getBuilderForStarredByUser($userId) public function getBuilderForStarredByUser($userId)
{ {
return $this return $this
->getBuilderByUser($userId, 'starredAt', 'desc') ->getSortedQueryBuilderByUser($userId, 'starredAt', 'desc')
->andWhere('e.isStarred = true') ->andWhere('e.isStarred = true')
; ;
} }
@ -82,7 +82,7 @@ class EntryRepository extends EntityRepository
public function getBuilderForSearchByUser($userId, $term, $currentRoute) public function getBuilderForSearchByUser($userId, $term, $currentRoute)
{ {
$qb = $this $qb = $this
->getBuilderByUser($userId); ->getSortedQueryBuilderByUser($userId);
if ('starred' === $currentRoute) { if ('starred' === $currentRoute) {
$qb->andWhere('e.isStarred = true'); $qb->andWhere('e.isStarred = true');
@ -111,7 +111,7 @@ class EntryRepository extends EntityRepository
public function getBuilderForUntaggedByUser($userId) public function getBuilderForUntaggedByUser($userId)
{ {
return $this return $this
->getBuilderByUser($userId) ->getSortedQueryBuilderByUser($userId)
->andWhere('size(e.tags) = 0'); ->andWhere('size(e.tags) = 0');
} }
@ -260,7 +260,7 @@ class EntryRepository extends EntityRepository
*/ */
public function removeTag($userId, Tag $tag) public function removeTag($userId, Tag $tag)
{ {
$entries = $this->getBuilderByUser($userId) $entries = $this->getSortedQueryBuilderByUser($userId)
->innerJoin('e.tags', 't') ->innerJoin('e.tags', 't')
->andWhere('t.id = :tagId')->setParameter('tagId', $tag->getId()) ->andWhere('t.id = :tagId')->setParameter('tagId', $tag->getId())
->getQuery() ->getQuery()
@ -296,7 +296,7 @@ class EntryRepository extends EntityRepository
*/ */
public function findAllByTagId($userId, $tagId) public function findAllByTagId($userId, $tagId)
{ {
return $this->getBuilderByUser($userId) return $this->getSortedQueryBuilderByUser($userId)
->innerJoin('e.tags', 't') ->innerJoin('e.tags', 't')
->andWhere('t.id = :tagId')->setParameter('tagId', $tagId) ->andWhere('t.id = :tagId')->setParameter('tagId', $tagId)
->getQuery() ->getQuery()
@ -414,7 +414,20 @@ class EntryRepository extends EntityRepository
} }
/** /**
* 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 getQueryBuilderByUser($userId)
{
return $this->createQueryBuilder('e')
->andWhere('e.user = :userId')->setParameter('userId', $userId);
}
/**
* Return a sorted query builder to be used by other getBuilderFor* method.
* *
* @param int $userId * @param int $userId
* @param string $sortBy * @param string $sortBy
@ -422,10 +435,23 @@ class EntryRepository extends EntityRepository
* *
* @return QueryBuilder * @return QueryBuilder
*/ */
private function getBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc') private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc')
{ {
return $this->createQueryBuilder('e') return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId));
->andWhere('e.user = :userId')->setParameter('userId', $userId) }
/**
* 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); ->orderBy(sprintf('e.%s', $sortBy), $direction);
} }
} }