mirror of
https://github.com/wallabag/wallabag.git
synced 2025-09-15 18:57:05 +00:00
Use scheduled entity insertions to avoid tag duplicate
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
This commit is contained in:
parent
faa86e06ba
commit
401135852c
7 changed files with 89 additions and 7 deletions
|
@ -96,13 +96,24 @@ class ContentProxy
|
|||
*
|
||||
* @param Entry $entry
|
||||
* @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);
|
||||
|
||||
|
@ -111,11 +122,15 @@ class ContentProxy
|
|||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue