X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FRepository%2FEntryRepository.php;h=4d45e5f51080bf85e049b4f5b90bfc119741bfba;hb=97c8eb3c2398d0aaf06155de5e0828e4020cb5d4;hp=0e82b9b20dbf0698ede8b73386347d19301fd01e;hpb=159986c4fbf63dd93136ea5c52ff0be705aefaf3;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 0e82b9b2..4d45e5f5 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Repository; use Doctrine\ORM\EntityRepository; use Pagerfanta\Adapter\DoctrineORMAdapter; use Pagerfanta\Pagerfanta; +use Wallabag\CoreBundle\Entity\Tag; class EntryRepository extends EntityRepository { @@ -121,6 +122,8 @@ class EntryRepository extends EntityRepository /** * Fetch an entry with a tag. Only used for tests. * + * @param int $userId + * * @return Entry */ public function findOneWithTags($userId) @@ -154,7 +157,7 @@ class EntryRepository extends EntityRepository ->getQuery() ->getResult(); - $languages = array(); + $languages = []; foreach ($results as $result) { $languages[$result['language']] = $result['language']; } @@ -163,38 +166,104 @@ class EntryRepository extends EntityRepository } /** - * Used only in test case to get the right entry associated to the right user + * Used only in test case to get the right entry associated to the right user. * - * @param string $username + * @param string $username * * @return Entry */ - public function findOneByUsernameAndNotStarred($username) + public function findOneByUsernameAndNotArchived($username) { return $this->createQueryBuilder('e') ->leftJoin('e.user', 'u') ->where('u.username = :username')->setParameter('username', $username) - ->andWhere('e.isStarred = false') + ->andWhere('e.isArchived = false') ->setMaxResults(1) ->getQuery() ->getSingleResult(); } /** - * Used only in test case to get the right entry associated to the right user + * Remove a tag from all user entries. * - * @param string $username + * We need to loop on each entry attached to the given tag to remove it, since Doctrine doesn't know EntryTag entity because it's a ManyToMany relation. + * It could be faster with one query but I don't know how to retrieve the table name `entry_tag` which can have a prefix: * - * @return Entry + * DELETE et FROM entry_tag et WHERE et.entry_id IN ( SELECT e.id FROM entry e WHERE e.user_id = :userId ) AND et.tag_id = :tagId + * + * @param int $userId + * @param Tag $tag */ - public function findOneByUsernameAndNotArchived($username) + public function removeTag($userId, Tag $tag) { - return $this->createQueryBuilder('e') - ->leftJoin('e.user', 'u') - ->where('u.username = :username')->setParameter('username', $username) - ->andWhere('e.isArchived = false') - ->setMaxResults(1) + $entries = $this->getBuilderByUser($userId) + ->innerJoin('e.tags', 't') + ->andWhere('t.id = :tagId')->setParameter('tagId', $tag->getId()) ->getQuery() - ->getSingleResult(); + ->getResult(); + + foreach ($entries as $entry) { + $entry->removeTag($tag); + } + + $this->getEntityManager()->flush(); + } + + /** + * Find all entries that are attached to a give tag id. + * + * @param int $userId + * @param int $tagId + * + * @return array + */ + public function findAllByTagId($userId, $tagId) + { + return $this->getBuilderByUser($userId) + ->innerJoin('e.tags', 't') + ->andWhere('t.id = :tagId')->setParameter('tagId', $tagId) + ->getQuery() + ->getResult(); + } + + /** + * Find an entry by its url and its owner. + * If it exists, return the entry otherwise return false. + * + * @param $url + * @param $userId + * + * @return Entry|bool + */ + public function findByUrlAndUserId($url, $userId) + { + $res = $this->createQueryBuilder('e') + ->where('e.url = :url')->setParameter('url', $url) + ->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 + * + * @return int + */ + public function countAllEntriesByUsername($userId) + { + $qb = $this->createQueryBuilder('e') + ->select('count(e)') + ->where('e.user=:userId')->setParameter('userId', $userId) + ; + + return $qb->getQuery()->getSingleScalarResult(); } }