namespace Wallabag\CoreBundle\Repository;
use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NoResultException;
use Doctrine\ORM\QueryBuilder;
use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Pagerfanta;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\CoreBundle\Helper\UrlHasher;
class EntryRepository extends EntityRepository
{
* @param string $order
* @param int $since
* @param string $tags
+ * @param string $detail 'metadata' or 'full'. Include content field if 'full'
+ *
+ * @todo Breaking change: replace default detail=full by detail=metadata in a future version
*
* @return Pagerfanta
*/
- public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'asc', $since = 0, $tags = '')
+ public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'asc', $since = 0, $tags = '', $detail = 'full')
{
+ if (!\in_array(strtolower($detail), ['full', 'metadata'], true)) {
+ throw new \Exception('Detail "' . $detail . '" parameter is wrong, allowed: full or metadata');
+ }
+
$qb = $this->createQueryBuilder('e')
->leftJoin('e.tags', 't')
->where('e.user = :userId')->setParameter('userId', $userId);
+ if ('metadata' === $detail) {
+ $fieldNames = $this->getClassMetadata()->getFieldNames();
+ $fields = array_filter($fieldNames, function ($k) {
+ return 'content' !== $k;
+ });
+ $qb->select(sprintf('partial e.{%s}', implode(',', $fields)));
+ }
+
if (null !== $isArchived) {
$qb->andWhere('e.isArchived = :isArchived')->setParameter('isArchived', (bool) $isArchived);
}
* Find an entry by its url and its owner.
* If it exists, return the entry otherwise return false.
*
- * @param $url
- * @param $userId
+ * @param string $url
+ * @param int $userId
*
* @return Entry|bool
*/
public function findByUrlAndUserId($url, $userId)
+ {
+ return $this->findByHashedUrlAndUserId(
+ UrlHasher::hashUrl($url),
+ $userId
+ );
+ }
+
+ /**
+ * Find an entry by its hashed url and its owner.
+ * If it exists, return the entry otherwise return false.
+ *
+ * @param string $hashedUrl Url hashed using sha1
+ * @param int $userId
+ *
+ * @return Entry|bool
+ */
+ public function findByHashedUrlAndUserId($hashedUrl, $userId)
{
$res = $this->createQueryBuilder('e')
- ->where('e.url = :url')->setParameter('url', urldecode($url))
+ ->where('e.hashedUrl = :hashed_url')->setParameter('hashed_url', $hashedUrl)
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
->getQuery()
->getResult();
/**
* Find all entries by url and owner.
*
- * @param $url
- * @param $userId
+ * @param string $url
+ * @param int $userId
*
* @return array
*/
/**
* Returns a random entry, filtering by status.
*
- * @param $userId
- * @param string $type can be unread, archive, starred, etc
- *
- * @throws \Doctrine\ORM\NoResultException
- * @throws \Doctrine\ORM\NonUniqueResultException
+ * @param int $userId
+ * @param string $type Can be unread, archive, starred, etc
*
- * @see https://github.com/doctrine/doctrine2/issues/5479#issuecomment-403862934
+ * @throws NoResultException
*
* @return Entry
*/
public function getRandomEntry($userId, $type = '')
{
$qb = $this->getQueryBuilderByUser($userId)
- ->select('MIN(e.id)', 'MAX(e.id)');
+ ->select('e.id');
switch ($type) {
case 'unread':
break;
}
- $idLimits = $qb
- ->getQuery()
- ->getOneOrNullResult();
- $randomPossibleIds = rand($idLimits[1], $idLimits[2]);
+ $ids = $qb->getQuery()->getArrayResult();
- return $qb
- ->select('e')
- ->andWhere('e.id >= :random_id')
- ->setParameter('random_id', $randomPossibleIds)
- ->setMaxResults(1)
- ->getQuery()
- ->getSingleResult();
+ if (empty($ids)) {
+ throw new NoResultException();
+ }
+
+ // random select one in the list
+ $randomId = $ids[mt_rand(0, \count($ids) - 1)]['id'];
+
+ return $this->find($randomId);
}
/**