Use created_at as default sort

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Repository / EntryRepository.php

diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 24d1a57af0550eda5782c3fdd40d86f22c5aca24..4f03ae0f160762525262f510eba20063df61660b 100644 (file)
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -10,8 +10,6 @@ use Wallabag\CoreBundle\Entity\Tag;
 
 class EntryRepository extends EntityRepository
 {
-    private $lifeTime;
-
     /**
      * Return a query builder to used by other getBuilderFor* method.
      *
@@ -24,7 +22,7 @@ class EntryRepository extends EntityRepository
         return $this->createQueryBuilder('e')
             ->leftJoin('e.user', 'u')
             ->andWhere('u.id = :userId')->setParameter('userId', $userId)
-            ->orderBy('e.id', 'desc')
+            ->orderBy('e.createdAt', 'desc')
         ;
     }
 
@@ -130,7 +128,7 @@ class EntryRepository extends EntityRepository
             $qb->andWhere('e.isStarred =:isStarred')->setParameter('isStarred', (bool) $isStarred);
         }
 
-        if ($since >= 0) {
+        if ($since > 0) {
             $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since)));
         }
 
@@ -283,7 +281,7 @@ class EntryRepository extends EntityRepository
     public function findByUrlAndUserId($url, $userId)
     {
         $res = $this->createQueryBuilder('e')
-            ->where('e.url = :url')->setParameter('url', $url)
+            ->where('e.url = :url')->setParameter('url', urldecode($url))
             ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
             ->getQuery()
             ->getResult();
@@ -312,24 +310,23 @@ class EntryRepository extends EntityRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function setLifeTime($lifeTime)
-    {
-        $this->lifeTime = $lifeTime;
-    }
-
     /**
-     * Enable cache for a query.
+     * Count all entries for a tag and a user.
      *
-     * @param Query $query
+     * @param int $userId
+     * @param int $tagId
      *
-     * @return Query
+     * @return int
      */
-    public function enableCache(Query $query)
+    public function countAllEntriesByUserIdAndTagId($userId, $tagId)
     {
-        $query->useQueryCache(true);
-        $query->useResultCache(true);
-        $query->setResultCacheLifetime($this->lifeTime);
+        $qb = $this->createQueryBuilder('e')
+            ->select('count(e.id)')
+            ->leftJoin('e.tags', 't')
+            ->where('e.user=:userId')->setParameter('userId', $userId)
+            ->andWhere('t.id=:tagId')->setParameter('tagId', $tagId)
+        ;
 
-        return $query;
+        return $qb->getQuery()->getSingleScalarResult();
     }
 }