Merge pull request #1048 from wallabag/v2-sort-entries

sort entries in repository

1 files changed, 9 insertions, 1 deletions

diff --git a/src/Wallabag/CoreBundle/Repository/EntriesRepository.php b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
index dd92d520..ae854e5a 100644
--- a/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
@@ -26,6 +26,7 @@ class EntriesRepository extends EntityRepository
             ->where('e.isRead = 0')
             ->andWhere('e.userId =:userId')->setParameter('userId', $userId)
             ->andWhere('e.isDeleted=0')
+            ->orderBy('e.createdAt', 'desc')
             ->getQuery();
 
         $paginator = new Paginator($qb);
@@ -50,6 +51,7 @@ class EntriesRepository extends EntityRepository
             ->where('e.isRead = 1')
             ->andWhere('e.userId =:userId')->setParameter('userId', $userId)
             ->andWhere('e.isDeleted=0')
+            ->orderBy('e.createdAt', 'desc')
             ->getQuery();
 
         $paginator = new Paginator($qb);
@@ -74,6 +76,7 @@ class EntriesRepository extends EntityRepository
             ->where('e.isFav = 1')
             ->andWhere('e.userId =:userId')->setParameter('userId', $userId)
             ->andWhere('e.isDeleted=0')
+            ->orderBy('e.createdAt', 'desc')
             ->getQuery();
 
         $paginator = new Paginator($qb);
@@ -83,7 +86,6 @@ class EntriesRepository extends EntityRepository
 
     public function findEntries($userId, $isArchived, $isStarred, $isDeleted, $sort, $order)
     {
-        //TODO tous les paramètres ne sont pas utilisés, à corriger
         $qb = $this->createQueryBuilder('e')
             ->select('e')
             ->where('e.userId =:userId')->setParameter('userId', $userId);
@@ -100,6 +102,12 @@ class EntriesRepository extends EntityRepository
             $qb->andWhere('e.isDeleted =:isDeleted')->setParameter('isDeleted', $isDeleted);
         }
 
+        if ('created' === $sort) {
+            $qb->orderBy('e.createdAt', $order);
+        } elseif ('updated' === $sort) {
+            $qb->orderBy('e.updatedAt', $order);
+        }
+
         return $qb
             ->getQuery()
             ->getResult(Query::HYDRATE_ARRAY);