From 206bade58a279d7f2e34c2dbada10366b90d2d6b Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 1 Oct 2016 09:26:32 +0200
Subject: Add ability to reset some datas

- annotations
- tags
- entries
---
 src/Wallabag/CoreBundle/Repository/TagRepository.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Repository/TagRepository.php')

diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index e76878d4..69661b12 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -52,6 +52,23 @@ class TagRepository extends EntityRepository
             ->getArrayResult();
     }
 
+    /**
+     * Find all tags.
+     *
+     * @param int $userId
+     *
+     * @return array
+     */
+    public function findAllTags($userId)
+    {
+        return $this->createQueryBuilder('t')
+            ->select('t')
+            ->leftJoin('t.entries', 'e')
+            ->where('e.user = :userId')->setParameter('userId', $userId)
+            ->getQuery()
+            ->getResult();
+    }
+
     /**
      * Used only in test case to get a tag for our entry.
      *
-- 
cgit v1.2.3


From b0de88f75dead50385e80e3897dc3913a971b91e Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 11 Oct 2016 21:45:43 +0200
Subject: Use statements & update translation

---
 .../CoreBundle/Repository/TagRepository.php        | 33 ++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Repository/TagRepository.php')

diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index 69661b12..81445989 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -34,6 +34,9 @@ class TagRepository extends EntityRepository
 
     /**
      * 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
      *
@@ -41,32 +44,20 @@ class TagRepository extends EntityRepository
      */
     public function findAllTags($userId)
     {
-        return $this->createQueryBuilder('t')
-            ->select('t.slug', 't.label', 't.id')
+        $ids = $this->createQueryBuilder('t')
+            ->select('t.id')
             ->leftJoin('t.entries', 'e')
             ->where('e.user = :userId')->setParameter('userId', $userId)
-            ->groupBy('t.slug')
-            ->addGroupBy('t.label')
-            ->addGroupBy('t.id')
+            ->groupBy('t.id')
             ->getQuery()
             ->getArrayResult();
-    }
 
-    /**
-     * Find all tags.
-     *
-     * @param int $userId
-     *
-     * @return array
-     */
-    public function findAllTags($userId)
-    {
-        return $this->createQueryBuilder('t')
-            ->select('t')
-            ->leftJoin('t.entries', 'e')
-            ->where('e.user = :userId')->setParameter('userId', $userId)
-            ->getQuery()
-            ->getResult();
+        $tags = [];
+        foreach ($ids as $id) {
+            $tags[] = $this->find($id);
+        }
+
+        return $tags;
     }
 
     /**
-- 
cgit v1.2.3