From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Sat, 9 Apr 2016 11:44:54 +0000 (+0200)
Subject: Refactor EntryController
X-Git-Tag: 2.0.1~8^2~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b00a89e08f8811297cf81f71ead1433a101d5737;p=github%2Fwallabag%2Fwallabag.git

Refactor EntryController
---

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 1d0df889..177597ba 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -49,8 +49,7 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            // check for existing entry, if it exists, redirect to it with a message
-            $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+            $existingEntry = $this->checkIfEntryAlreadyExists($entry);
 
             if (false !== $existingEntry) {
                 $this->get('session')->getFlashBag()->add(
@@ -87,10 +86,7 @@ class EntryController extends Controller
         $entry = new Entry($this->getUser());
         $entry->setUrl($request->get('url'));
 
-        // check for existing entry, if it exists, redirect to it with a message
-        $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
-
-        if (false === $existingEntry) {
+        if (false === $this->checkIfEntryAlreadyExists($entry)) {
             $this->updateEntry($entry);
         }
 
@@ -426,4 +422,16 @@ class EntryController extends Controller
             throw $this->createAccessDeniedException('You can not access this entry.');
         }
     }
+
+    /**
+     * Check for existing entry, if it exists, redirect to it with a message.
+     *
+     * @param $entry
+     *
+     * @return array|bool
+     */
+    public function checkIfEntryAlreadyExists($entry)
+    {
+        return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+    }
 }