Merge remote-tracking branch 'origin/master' into 2.4

[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 fabb19638b7f1b9da2968929614d0658df807d47..f5089729643f94c67584445a4a0814c831949c0e 100644 (file)
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -3,6 +3,7 @@
 namespace Wallabag\CoreBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
@@ -345,6 +346,30 @@ class EntryRepository extends EntityRepository
         return false;
     }
 
+    /**
+     * Find an entry by its hashed url and its owner.
+     * If it exists, return the entry otherwise return false.
+     *
+     * @param string $hashedUrl Url hashed using sha1
+     * @param int    $userId
+     *
+     * @return Entry|bool
+     */
+    public function findByHashedUrlAndUserId($hashedUrl, $userId)
+    {
+        $res = $this->createQueryBuilder('e')
+            ->where('e.hashedUrl = :hashed_url')->setParameter('hashed_url', $hashedUrl)
+            ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
+            ->getQuery()
+            ->getResult();
+
+        if (\count($res)) {
+            return current($res);
+        }
+
+        return false;
+    }
+
     /**
      * Count all entries for a user.
      *
@@ -437,7 +462,7 @@ class EntryRepository extends EntityRepository
      * @param int    $userId
      * @param string $type   Can be unread, archive, starred, etc
      *
-     * @throws \Doctrine\ORM\NoResultException
+     * @throws NoResultException
      *
      * @return Entry
      */
@@ -464,6 +489,10 @@ class EntryRepository extends EntityRepository
 
         $ids = $qb->getQuery()->getArrayResult();
 
+        if (empty($ids)) {
+            throw new NoResultException();
+        }
+
         // random select one in the list
         $randomId = $ids[mt_rand(0, \count($ids) - 1)]['id'];