From e682a70f88338af66b8d47bfe078e32fd9c6520c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 31 Mar 2017 11:04:18 +0200
Subject: Refactored code
---
.../CoreBundle/Controller/ConfigController.php | 40 +++++++++-------------
1 file changed, 16 insertions(+), 24 deletions(-)
(limited to 'src')
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 7dbe3f18..b2814ade 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -284,14 +284,13 @@ class ConfigController extends Controller
}
/**
- * Remove all tags for a given user and cleanup orphan tags.
+ * Remove all tags for given tags and a given user and cleanup orphan tags.
*
- * @param int $userId
+ * @param array $tags
+ * @param int $userId
*/
- private function removeAllTagsByUserId($userId)
+ private function removeAllTagsByStatusAndUserId($tags, $userId)
{
- $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
-
if (empty($tags)) {
return;
}
@@ -312,6 +311,17 @@ class ConfigController extends Controller
$em->flush();
}
+ /**
+ * Remove all tags for a given user and cleanup orphan tags.
+ *
+ * @param int $userId
+ */
+ private function removeAllTagsByUserId($userId)
+ {
+ $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
+ $this->removeAllTagsByStatusAndUserId($tags, $userId);
+ }
+
/**
* Remove all tags for a given user and cleanup orphan tags.
*
@@ -320,25 +330,7 @@ class ConfigController extends Controller
private function removeTagsForArchivedByUserId($userId)
{
$tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findTagsForArchivedArticles($userId);
-
- if (empty($tags)) {
- return;
- }
-
- $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->removeTags($userId, $tags);
-
- // cleanup orphan tags
- $em = $this->getDoctrine()->getManager();
-
- foreach ($tags as $tag) {
- if (count($tag->getEntries()) === 0) {
- $em->remove($tag);
- }
- }
-
- $em->flush();
+ $this->removeAllTagsByStatusAndUserId($tags, $userId);
}
private function removeAnnotationsForArchivedByUserId($userId)
--
cgit v1.2.3