Merge pull request #3959 from wallabag/mig-tag-collation

[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..16c448851f444e73f3652313e1baffaa09ea9e40 100644 (file)
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -345,13 +345,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 +362,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 +377,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 +520,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.
      *