Skip to content

OSD-12116: #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 5.1
Choose a base branch
from
Open

OSD-12116: #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fe110
OSD-12116:
Mar 6, 2024
e1a3ec9
OSD-12116:
Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions ImportExport/Strategy/StrategyRelationsTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ protected function updateRelations($entity, array $itemData = null)
$isFullRelation = $this->fieldHelper->getConfigValue($entityName, $fieldName, 'full', false);
$isPersistRelation = $this->databaseHelper->isCascadePersist($entityName, $fieldName);

$searchContext = $this->generateSearchContextForRelationsUpdate(
$entity,
$entityName,
$fieldName,
$isPersistRelation
);

if ($this->fieldHelper->isSingleRelation($field)) {
// single relation
$relationEntity = $this->getObjectValue($entity, $fieldName);
Expand All @@ -56,16 +49,27 @@ protected function updateRelations($entity, array $itemData = null)
$isFullRelation,
$isPersistRelation,
$relationItemData,
$searchContext,
$this->generateSearchContextForRelationsUpdate(
$entity,
$entityName,
$fieldName,
$isPersistRelation
),
true
);
}
$this->fieldHelper->setObjectValue($entity, $fieldName, $relationEntity);
} elseif ($this->fieldHelper->isMultipleRelation($field)) {
// multiple relation
$relationCollection = $this->getObjectValue($entity, $fieldName);
if ($relationCollection instanceof Collection) {
if (($relationCollection instanceof Collection) && $relationCollection->count()) {
$collectionItemData = $this->fieldHelper->getItemData($itemData, $fieldName);
$searchContext = $this->generateSearchContextForRelationsUpdate(
$entity,
$entityName,
$fieldName,
$isPersistRelation
);
foreach ($relationCollection as $collectionEntity) {
$entityItemData = $this->fieldHelper->getItemData(array_shift($collectionItemData));
$existingCollectionEntity = $this->processEntity(
Expand Down