$tags = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Tag')
- ->findAllTags($this->getUser()->getId())
- ->getQuery()
- ->getResult();
+ ->findAllTagsWithEntries($this->getUser()->getId());
$json = $this->get('serializer')->serialize($tags, 'json');
{
$tags = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Tag')
- ->findAllTags($this->getUser()->getId())
- ->getQuery()
- ->getResult();
-
- return $this->render(
- 'WallabagCoreBundle:Tag:tags.html.twig',
- [
- 'tags' => $tags,
- ]
- );
+ ->findAllTagsWithEntries($this->getUser()->getId());
+
+ return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
+ 'tags' => $tags,
+ ]);
}
/**
}
}
- return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- [
- 'form' => null,
- 'entries' => $entries,
- 'currentPage' => $page,
- ]
- );
+ return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
+ 'form' => null,
+ 'entries' => $entries,
+ 'currentPage' => $page,
+ ]);
}
}
* Assign some tags to an entry.
*
* @param Entry $entry
- * @param array|string $tags An array of tag or a string coma separated of tag
+ * @param array|string $tags An array of tag or a string coma separated of tag
+ * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
+ * It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101
*/
- public function assignTagsToEntry(Entry $entry, $tags)
+ public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = [])
{
if (!is_array($tags)) {
$tags = explode(',', $tags);
}
+ // keeps only Tag entity from the "not yet flushed entities"
+ $tagsNotYetFlushed = [];
+ foreach ($entitiesReady as $entity) {
+ if ($entity instanceof Tag) {
+ $tagsNotYetFlushed[$entity->getLabel()] = $entity;
+ }
+ }
+
foreach ($tags as $label) {
$label = trim($label);
continue;
}
- $tagEntity = $this->tagRepository->findOneByLabel($label);
+ if (isset($tagsNotYetFlushed[$label])) {
+ $tagEntity = $tagsNotYetFlushed[$label];
+ } else {
+ $tagEntity = $this->tagRepository->findOneByLabel($label);
- if (is_null($tagEntity)) {
- $tagEntity = new Tag();
- $tagEntity->setLabel($label);
+ if (is_null($tagEntity)) {
+ $tagEntity = new Tag();
+ $tagEntity->setLabel($label);
+ }
}
// only add the tag on the entry if the relation doesn't exist
class TagRepository extends EntityRepository
{
/**
- * Find Tags.
+ * Count all tags per user.
+ *
+ * @param int $userId
+ * @param int $cacheLifeTime Duration of the cache for this query
+ *
+ * @return int
+ */
+ public function countAllTags($userId, $cacheLifeTime = null)
+ {
+ $query = $this->createQueryBuilder('t')
+ ->select('t.slug')
+ ->leftJoin('t.entries', 'e')
+ ->where('e.user = :userId')->setParameter('userId', $userId)
+ ->groupBy('t.slug')
+ ->getQuery();
+
+ if (null !== $cacheLifeTime) {
+ $query->useQueryCache(true);
+ $query->useResultCache(true);
+ $query->setResultCacheLifetime($cacheLifeTime);
+ }
+
+ return count($query->getArrayResult());
+ }
+
+ /**
+ * Find all tags with associated entries per user.
*
* @param int $userId
*
* @return array
*/
- public function findAllTags($userId)
+ public function findAllTagsWithEntries($userId)
{
return $this->createQueryBuilder('t')
->leftJoin('t.entries', 'e')
- ->where('e.user = :userId')->setParameter('userId', $userId);
+ ->where('e.user = :userId')->setParameter('userId', $userId)
+ ->getQuery()
+ ->getResult();
}
/**
namespace Wallabag\CoreBundle\Twig;
-use Doctrine\ORM\Query;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
->groupBy('e.id')
->getQuery();
- $data = $this->enableCache($query)
- ->getArrayResult();
+ $query->useQueryCache(true);
+ $query->useResultCache(true);
+ $query->setResultCacheLifetime($this->lifeTime);
- return count($data);
+ return count($query->getArrayResult());
}
/**
return 0;
}
- $qb = $this->tagRepository->findAllTags($user->getId());
-
- $data = $this->enableCache($qb->getQuery())
- ->getArrayResult();
-
- return count($data);
- }
-
- /**
- * Enable cache for a query.
- *
- * @param Query $query
- *
- * @return Query
- */
- private function enableCache(Query $query)
- {
- $query->useQueryCache(true);
- $query->useResultCache(true);
- $query->setResultCacheLifetime($this->lifeTime);
-
- return $query;
+ return $this->tagRepository->countAllTags($user->getId());
}
public function getName()
if (isset($importedEntry['tags']) && !empty($importedEntry['tags'])) {
$this->contentProxy->assignTagsToEntry(
$entry,
- array_keys($importedEntry['tags'])
+ array_keys($importedEntry['tags']),
+ $this->em->getUnitOfWork()->getScheduledEntityInsertions()
);
}
if (array_key_exists('tags', $data)) {
$this->contentProxy->assignTagsToEntry(
$entry,
- $data['tags']
+ $data['tags'],
+ $this->em->getUnitOfWork()->getScheduledEntityInsertions()
);
}
$this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
}
+ public function testAssignTagsNotFlushed()
+ {
+ $graby = $this->getMockBuilder('Graby\Graby')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $tagRepo = $this->getTagRepositoryMock();
+ $tagRepo->expects($this->never())
+ ->method('__call');
+
+ $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger());
+
+ $tagEntity = new Tag();
+ $tagEntity->setLabel('tag1');
+
+ $entry = new Entry(new User());
+
+ $proxy->assignTagsToEntry($entry, 'tag1', [$tagEntity]);
+
+ $this->assertCount(1, $entry->getTags());
+ $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
+ }
+
private function getTaggerMock()
{
return $this->getMockBuilder('Wallabag\CoreBundle\Helper\RuleBasedTagger')
->disableOriginalConstructor()
->getMock();
+ $this->uow = $this->getMockBuilder('Doctrine\ORM\UnitOfWork')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->em
+ ->expects($this->any())
+ ->method('getUnitOfWork')
+ ->willReturn($this->uow);
+
+ $this->uow
+ ->expects($this->any())
+ ->method('getScheduledEntityInsertions')
+ ->willReturn([]);
+
$pocket = new PocketImport(
$this->em,
$this->contentProxy
->disableOriginalConstructor()
->getMock();
+ $this->uow = $this->getMockBuilder('Doctrine\ORM\UnitOfWork')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->em
+ ->expects($this->any())
+ ->method('getUnitOfWork')
+ ->willReturn($this->uow);
+
+ $this->uow
+ ->expects($this->any())
+ ->method('getScheduledEntityInsertions')
+ ->willReturn([]);
+
$this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy')
->disableOriginalConstructor()
->getMock();
->disableOriginalConstructor()
->getMock();
+ $this->uow = $this->getMockBuilder('Doctrine\ORM\UnitOfWork')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->em
+ ->expects($this->any())
+ ->method('getUnitOfWork')
+ ->willReturn($this->uow);
+
+ $this->uow
+ ->expects($this->any())
+ ->method('getScheduledEntityInsertions')
+ ->willReturn([]);
+
$this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy')
->disableOriginalConstructor()
->getMock();