1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-10-20 19:52:09 +00:00

Merge pull request #3271 from wallabag/store-resolved-url

Add `given_url` in Entry table to check if a redirected url has already added
This commit is contained in:
Jérémy Benoist 2019-06-05 11:38:00 +02:00 committed by GitHub
commit 16e1c07553
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 164 additions and 11 deletions

View file

@ -366,6 +366,7 @@ class EntryRepository extends EntityRepository
*/
public function findByHashedUrlAndUserId($hashedUrl, $userId)
{
// try first using hashed_url (to use the database index)
$res = $this->createQueryBuilder('e')
->where('e.hashedUrl = :hashed_url')->setParameter('hashed_url', $hashedUrl)
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
@ -376,6 +377,17 @@ class EntryRepository extends EntityRepository
return current($res);
}
// then try using hashed_given_url (to use the database index)
$res = $this->createQueryBuilder('e')
->where('e.hashedGivenUrl = :hashed_given_url')->setParameter('hashed_given_url', $hashedUrl)
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
->getQuery()
->getResult();
if (\count($res)) {
return current($res);
}
return false;
}