X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FRepository%2FTagRepository.php;h=3ae9d4141161c4443eb98f9bc6533695558e6143;hb=2a1ceb67b4400f46f4d3067e887ff54aa906f0a2;hp=8d9cf85cef14677ff66077f8b057d62acc257257;hpb=567421af5019bf5937aa2b4214b405d87a1f1f86;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index 8d9cf85c..3ae9d414 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -3,53 +3,84 @@
 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.
+     * Find all tags (flat) per user with nb entries.
      *
      * @param int $userId
      *
      * @return array
      */
-    public function findAllTags($userId)
+    public function findAllFlatTagsWithNbEntries($userId)
     {
-        return $this->getQbForAllTags($userId)
+        return $this->createQueryBuilder('t')
+            ->select('t.id, t.label, t.slug, count(e.id) as nbEntries')
+            ->distinct(true)
+            ->leftJoin('t.entries', 'e')
+            ->where('e.user = :userId')
+            ->groupBy('t.id')
+            ->orderBy('t.slug')
+            ->setParameter('userId', $userId)
             ->getQuery()
-            ->getResult();
+            ->getArrayResult();
     }
 
     /**
@@ -57,7 +88,7 @@ class TagRepository extends EntityRepository
      *
      * @return Tag
      */
-    public function findOnebyEntryAndLabel($entry, $label)
+    public function findOneByEntryAndTagLabel($entry, $label)
     {
         return $this->createQueryBuilder('t')
             ->leftJoin('t.entries', 'e')
@@ -67,4 +98,24 @@ class TagRepository extends EntityRepository
             ->getQuery()
             ->getSingleResult();
     }
+
+    public function findForArchivedArticlesByUser($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()
+            ->getArrayResult();
+
+        $tags = [];
+        foreach ($ids as $id) {
+            $tags[] = $this->find($id);
+        }
+
+        return $tags;
+    }
 }