X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FRepository%2FTagRepository.php;h=213283e5d6d8b1da418a2eba536823fc152ec83e;hb=52b84c11a5b5474cd45271d937a46c6adfdf2749;hp=c4aeb5949f79fe76a69b8427300dfe625f283d4e;hpb=dad1c546a521159ca65a5a7649651d37728f0e55;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index c4aeb594..213283e5 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -3,52 +3,98 @@
 namespace Wallabag\CoreBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
-use Pagerfanta\Pagerfanta;
+use Wallabag\CoreBundle\Entity\Tag;
 
 class TagRepository extends EntityRepository
 {
     /**
-     * Return only the QueryBuilder to retrieve all tags for a given user.
+     * Count all tags per user.
      *
      * @param int $userId
+     * @param int $cacheLifeTime Duration of the cache for this query
      *
-     * @return QueryBuilder
+     * @return int
      */
-    private function getQbForAllTags($userId)
+    public function countAllTags($userId, $cacheLifeTime = null)
     {
-        return $this->createQueryBuilder('t')
+        $query = $this->createQueryBuilder('t')
+            ->select('t.slug')
             ->leftJoin('t.entries', 'e')
-            ->where('e.user = :userId')->setParameter('userId', $userId);
+            ->where('e.user = :userId')->setParameter('userId', $userId)
+            ->groupBy('t.slug')
+            ->getQuery();
+
+        if (null !== $cacheLifeTime) {
+            $query->useQueryCache(true);
+            $query->useResultCache(true);
+            $query->setResultCacheLifetime($cacheLifeTime);
+        }
+
+        return count($query->getArrayResult());
     }
 
     /**
-     * Find Tags and return a Pager.
+     * Find all tags per user.
+     * Instead of just left joined on the Entry table, we select only id and group by id to avoid tag multiplication in results.
+     * Once we have all tags id, we can safely request them one by one.
+     * This'll still be fastest than the previous query.
      *
      * @param int $userId
      *
-     * @return Pagerfanta
+     * @return array
      */
-    public function findTags($userId)
+    public function findAllTags($userId)
     {
-        $qb = $this->getQbForAllTags($userId);
+        $ids = $this->createQueryBuilder('t')
+            ->select('t.id')
+            ->leftJoin('t.entries', 'e')
+            ->where('e.user = :userId')->setParameter('userId', $userId)
+            ->groupBy('t.id')
+            ->orderBy('t.slug')
+            ->getQuery()
+            ->getArrayResult();
 
-        $pagerAdapter = new DoctrineORMAdapter($qb);
+        $tags = [];
+        foreach ($ids as $id) {
+            $tags[] = $this->find($id);
+        }
 
-        return new Pagerfanta($pagerAdapter);
+        return $tags;
     }
 
     /**
-     * Find Tags.
+     * Used only in test case to get a tag for our entry.
      *
-     * @param int $userId
-     *
-     * @return array
+     * @return Tag
      */
-    public function findAllTags($userId)
+    public function findOneByEntryAndTagLabel($entry, $label)
+    {
+        return $this->createQueryBuilder('t')
+            ->leftJoin('t.entries', 'e')
+            ->where('e.id = :entryId')->setParameter('entryId', $entry->getId())
+            ->andWhere('t.label = :label')->setParameter('label', $label)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult();
+    }
+
+    public function findForArchivedArticlesByUser($userId)
     {
-        return $this->getQbForAllTags($userId)
+        $ids = $this->createQueryBuilder('t')
+            ->select('t.id')
+            ->leftJoin('t.entries', 'e')
+            ->where('e.user = :userId')->setParameter('userId', $userId)
+            ->andWhere('e.isArchived = true')
+            ->groupBy('t.id')
+            ->orderBy('t.slug')
             ->getQuery()
-            ->getResult();
+            ->getArrayResult();
+
+        $tags = [];
+        foreach ($ids as $id) {
+            $tags[] = $this->find($id);
+        }
+
+        return $tags;
     }
 }