diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Repository')
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 8 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/UserRepository.php | 26 |
2 files changed, 30 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 53e8e2ba..a8c138a9 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -26,7 +26,7 @@ class EntryRepository extends EntityRepository | |||
26 | ->leftJoin('e.user', 'u') | 26 | ->leftJoin('e.user', 'u') |
27 | ->where('e.isArchived = false') | 27 | ->where('e.isArchived = false') |
28 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) | 28 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) |
29 | ->orderBy('e.createdAt', 'desc') | 29 | ->orderBy('e.id', 'desc') |
30 | ->getQuery(); | 30 | ->getQuery(); |
31 | 31 | ||
32 | $paginator = new Paginator($qb); | 32 | $paginator = new Paginator($qb); |
@@ -52,7 +52,7 @@ class EntryRepository extends EntityRepository | |||
52 | ->leftJoin('e.user', 'u') | 52 | ->leftJoin('e.user', 'u') |
53 | ->where('e.isArchived = true') | 53 | ->where('e.isArchived = true') |
54 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) | 54 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) |
55 | ->orderBy('e.createdAt', 'desc') | 55 | ->orderBy('e.id', 'desc') |
56 | ->getQuery(); | 56 | ->getQuery(); |
57 | 57 | ||
58 | $paginator = new Paginator($qb); | 58 | $paginator = new Paginator($qb); |
@@ -78,7 +78,7 @@ class EntryRepository extends EntityRepository | |||
78 | ->leftJoin('e.user', 'u') | 78 | ->leftJoin('e.user', 'u') |
79 | ->where('e.isStarred = true') | 79 | ->where('e.isStarred = true') |
80 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) | 80 | ->andWhere('u.id =:userId')->setParameter('userId', $userId) |
81 | ->orderBy('e.createdAt', 'desc') | 81 | ->orderBy('e.id', 'desc') |
82 | ->getQuery(); | 82 | ->getQuery(); |
83 | 83 | ||
84 | $paginator = new Paginator($qb); | 84 | $paginator = new Paginator($qb); |
@@ -111,7 +111,7 @@ class EntryRepository extends EntityRepository | |||
111 | } | 111 | } |
112 | 112 | ||
113 | if ('created' === $sort) { | 113 | if ('created' === $sort) { |
114 | $qb->orderBy('e.createdAt', $order); | 114 | $qb->orderBy('e.id', $order); |
115 | } elseif ('updated' === $sort) { | 115 | } elseif ('updated' === $sort) { |
116 | $qb->orderBy('e.updatedAt', $order); | 116 | $qb->orderBy('e.updatedAt', $order); |
117 | } | 117 | } |
diff --git a/src/Wallabag/CoreBundle/Repository/UserRepository.php b/src/Wallabag/CoreBundle/Repository/UserRepository.php new file mode 100644 index 00000000..aab3dedc --- /dev/null +++ b/src/Wallabag/CoreBundle/Repository/UserRepository.php | |||
@@ -0,0 +1,26 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Repository; | ||
4 | |||
5 | use Doctrine\ORM\EntityRepository; | ||
6 | |||
7 | class UserRepository extends EntityRepository | ||
8 | { | ||
9 | /** | ||
10 | * Find a user by its username and rss roken | ||
11 | * | ||
12 | * @param string $username | ||
13 | * @param string $rssToken | ||
14 | * | ||
15 | * @return User|null | ||
16 | */ | ||
17 | public function findOneByUsernameAndRsstoken($username, $rssToken) | ||
18 | { | ||
19 | return $this->createQueryBuilder('u') | ||
20 | ->leftJoin('u.config', 'c') | ||
21 | ->where('c.rssToken = :rss_token')->setParameter('rss_token', $rssToken) | ||
22 | ->andWhere('u.username = :username')->setParameter('username', $username) | ||
23 | ->getQuery() | ||
24 | ->getOneOrNullResult(); | ||
25 | } | ||
26 | } | ||