mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-15 18:00:36 +01:00
Merge pull request #3712 from wallabag/refactor-entry-queries
Rename getBuilderByUser and refactor query for untagged entries
This commit is contained in:
commit
495f83c925
@ -21,7 +21,7 @@ class AnnotationRepository extends EntityRepository
|
|||||||
public function getBuilderForAllByUser($userId)
|
public function getBuilderForAllByUser($userId)
|
||||||
{
|
{
|
||||||
return $this
|
return $this
|
||||||
->getBuilderByUser($userId)
|
->getSortedQueryBuilderByUser($userId)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,7 +133,7 @@ class AnnotationRepository extends EntityRepository
|
|||||||
*
|
*
|
||||||
* @return QueryBuilder
|
* @return QueryBuilder
|
||||||
*/
|
*/
|
||||||
private function getBuilderByUser($userId)
|
private function getSortedQueryBuilderByUser($userId)
|
||||||
{
|
{
|
||||||
return $this->createQueryBuilder('a')
|
return $this->createQueryBuilder('a')
|
||||||
->leftJoin('a.user', 'u')
|
->leftJoin('a.user', 'u')
|
||||||
|
@ -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');
|
||||||
@ -102,7 +102,7 @@ class EntryRepository extends EntityRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves untagged entries for a user.
|
* Retrieve a sorted list of untagged entries for a user.
|
||||||
*
|
*
|
||||||
* @param int $userId
|
* @param int $userId
|
||||||
*
|
*
|
||||||
@ -111,8 +111,21 @@ class EntryRepository extends EntityRepository
|
|||||||
public function getBuilderForUntaggedByUser($userId)
|
public function getBuilderForUntaggedByUser($userId)
|
||||||
{
|
{
|
||||||
return $this
|
return $this
|
||||||
->getBuilderByUser($userId)
|
->sortQueryBuilder($this->getRawBuilderForUntaggedByUser($userId));
|
||||||
->andWhere('size(e.tags) = 0');
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -260,7 +273,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 +309,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 +427,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 +448,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user