Keep url in exists endpoint

- Add migration
- Use md5 instead of sha512 (we don't need security here, just a hash)
- Update tests

4 files changed, 40 insertions, 9 deletions

diff --git a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
index fe2644f2..fb598390 100644
--- a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
@@ -45,13 +45,13 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
         } else {
             $users = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findAll();
 
-            $output->writeln(sprintf('Generating hashed urls for the %d user account entries', count($users)));
+            $output->writeln(sprintf('Generating hashed urls for "%d" users', \count($users)));
 
             foreach ($users as $user) {
-                $output->writeln(sprintf('Processing user %s', $user->getUsername()));
+                $output->writeln(sprintf('Processing user: %s', $user->getUsername()));
                 $this->generateHashedUrls($user);
             }
-            $output->writeln(sprintf('Finished generated hashed urls'));
+            $output->writeln('Finished generated hashed urls');
         }
 
         return 0;
@@ -67,13 +67,20 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
 
         $entries = $repo->findByUser($user->getId());
 
+        $i = 1;
         foreach ($entries as $entry) {
-            $entry->setHashedUrl(hash('sha512', $entry->getUrl()));
+            $entry->setHashedUrl(hash('md5', $entry->getUrl()));
             $em->persist($entry);
-            $em->flush();
+
+            if (0 === ($i % 20)) {
+                $em->flush();
+            }
+            ++$i;
         }
 
-        $this->output->writeln(sprintf('Generated hashed urls for user %s', $user->getUserName()));
+        $em->flush();
+
+        $this->output->writeln(sprintf('Generated hashed urls for user: %s', $user->getUserName()));
     }
 
     /**
diff --git a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
index 9c10500d..1b18cad6 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
@@ -30,7 +30,6 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
             'entry2' => [
                 'user' => 'admin-user',
                 'url' => 'http://0.0.0.0/entry2',
-                'hashed_url' => hash('md5', 'http://0.0.0.0/entry2'),
                 'reading_time' => 1,
                 'domain' => 'domain.io',
                 'mime' => 'text/html',
@@ -90,6 +89,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
         foreach ($entries as $reference => $item) {
             $entry = new Entry($this->getReference($item['user']));
             $entry->setUrl($item['url']);
+            $entry->setHashedUrl(hash('md5', $item['url']));
             $entry->setReadingTime($item['reading_time']);
             $entry->setDomainName($item['domain']);
             $entry->setMimetype($item['mime']);
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 17a1ed58..a04f101f 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -26,7 +26,7 @@ use Wallabag\UserBundle\Entity\User;
  *     indexes={
  *         @ORM\Index(name="created_at", columns={"created_at"}),
  *         @ORM\Index(name="uid", columns={"uid"}),
- *         @ORM\Index(name="hashedurl", columns={"hashedurl"})
+ *         @ORM\Index(name="hashed_url", columns={"hashed_url"})
  *     }
  * )
  * @ORM\HasLifecycleCallbacks()
@@ -79,7 +79,7 @@ class Entry
     /**
      * @var string
      *
-     * @ORM\Column(name="hashedurl", type="text", nullable=true)
+     * @ORM\Column(name="hashed_url", type="string", length=32, nullable=true)
      */
     private $hashedUrl;
 
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 45366623..0c175abb 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -347,6 +347,30 @@ class EntryRepository extends EntityRepository
     }
 
     /**
+     * Find an entry by its hashed url and its owner.
+     * If it exists, return the entry otherwise return false.
+     *
+     * @param $hashedUrl
+     * @param $userId
+     *
+     * @return Entry|bool
+     */
+    public function findByHashedUrlAndUserId($hashedUrl, $userId)
+    {
+        $res = $this->createQueryBuilder('e')
+            ->where('e.hashedUrl = :hashed_url')->setParameter('hashed_url', urldecode($hashedUrl))
+            ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
+            ->getQuery()
+            ->getResult();
+
+        if (\count($res)) {
+            return current($res);
+        }
+
+        return false;
+    }
+
+    /**
      * Count all entries for a user.
      *
      * @param int $userId