Merge pull request #4151 from ldidry/fix-4060

[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 37fc1000fb78af4caf0901e3c3f87807d0600c1b..bfd079377ac783bdd4c2e0e2f84cb3f2e9d0496b 100644 (file)
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -129,6 +129,21 @@ class EntryRepository extends EntityRepository
             ->andWhere('t.id is null');
     }
 
+    /**
+     * Retrieve the number of untagged entries for a user.
+     *
+     * @param int $userId
+     *
+     * @return int
+     */
+    public function countUntaggedEntriesByUser($userId)
+    {
+        return (int) $this->getRawBuilderForUntaggedByUser($userId)
+            ->select('count(e.id)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     /**
      * Find Entries.
      *
@@ -291,7 +306,6 @@ class EntryRepository extends EntityRepository
      * DELETE et FROM entry_tag et WHERE et.entry_id IN ( SELECT e.id FROM entry e WHERE e.user_id = :userId ) AND et.tag_id = :tagId
      *
      * @param int $userId
-     * @param Tag $tag
      */
     public function removeTag($userId, Tag $tag)
     {
@@ -345,13 +359,14 @@ class EntryRepository extends EntityRepository
      * @param string $url
      * @param int    $userId
      *
-     * @return Entry|bool
+     * @return Entry|false
      */
     public function findByUrlAndUserId($url, $userId)
     {
         return $this->findByHashedUrlAndUserId(
             UrlHasher::hashUrl($url),
-            $userId);
+            $userId
+        );
     }
 
     /**
@@ -361,10 +376,11 @@ class EntryRepository extends EntityRepository
      * @param string $hashedUrl Url hashed using sha1
      * @param int    $userId
      *
-     * @return Entry|bool
+     * @return Entry|false
      */
     public function findByHashedUrlAndUserId($hashedUrl, $userId)
     {
+        // try first using hashed_url (to use the database index)
         $res = $this->createQueryBuilder('e')
             ->where('e.hashedUrl = :hashed_url')->setParameter('hashed_url', $hashedUrl)
             ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
@@ -375,6 +391,17 @@ class EntryRepository extends EntityRepository
             return current($res);
         }
 
+        // then try using hashed_given_url (to use the database index)
+        $res = $this->createQueryBuilder('e')
+            ->where('e.hashedGivenUrl = :hashed_given_url')->setParameter('hashed_given_url', $hashedUrl)
+            ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
+            ->getQuery()
+            ->getResult();
+
+        if (\count($res)) {
+            return current($res);
+        }
+
         return false;
     }
 
@@ -507,32 +534,6 @@ class EntryRepository extends EntityRepository
         return $this->find($randomId);
     }
 
-    /**
-     * Inject a UrlHasher.
-     *
-     * @param UrlHasher $hasher
-     */
-    public function setUrlHasher(UrlHasher $hasher)
-    {
-        $this->urlHasher = $hasher;
-    }
-
-    /**
-     * Get the UrlHasher, or create a default one if not injected.
-     *
-     * XXX: the default uses the default hash algorithm
-     *
-     * @return UrlHasher
-     */
-    protected function getUrlHasher()
-    {
-        if (!isset($this->urlHasher)) {
-            $this->setUrlHasher(new UrlHasher());
-        }
-
-        return $this->urlHasher;
-    }
-
     /**
      * Return a query builder to be used by other getBuilderFor* method.
      *
@@ -563,9 +564,8 @@ class EntryRepository extends EntityRepository
     /**
      * Return the given QueryBuilder with an orderBy() call.
      *
-     * @param QueryBuilder $qb
-     * @param string       $sortBy
-     * @param string       $direction
+     * @param string $sortBy
+     * @param string $direction
      *
      * @return QueryBuilder
      */