Skip to content
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

Jump to bottom

[BUG, EC] Followup Data Hub Data Importer does not respect overwrite flags for Key mappings #426

Open
wants to merge 9 commits into
base: 1.9
Choose a base branch
from
Open

[BUG, EC] Followup Data Hub Data Importer does not respect overwrite flags for Key mappings #426

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28ea670
Update Direct.php
kingjia90 Oct 9, 2024
a2862a2
Apply php-cs-fixer changes
kingjia90 Oct 9, 2024
ac9d31a
target only fieldName key
kingjia90 Oct 9, 2024
e2d277a
Apply php-cs-fixer changes
kingjia90 Oct 9, 2024
f534ae2
Added parameter to uniqueid as key assignment
mcop1 Oct 28, 2024
3f303c3
Apply php-cs-fixer changes
mcop1 Oct 28, 2024
846313a
Avoid bc break
mcop1 Oct 28, 2024
2b8919c
Merge remote-tracking branch 'origin/follow-425' into follow-425
mcop1 Oct 28, 2024
1580a10
Apply php-cs-fixer changes
mcop1 Oct 28, 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
14 changes: 11 additions & 3 deletions src/Mapping/DataTarget/Direct.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,20 @@ protected function checkAssignData($newData, $valueContainer, $getter)
$fieldName = $fieldNameParts[2];
}

$fieldDefinition = $this->getFieldDefinition($valueContainer, $fieldName);
if ($this->writeIfTargetIsNotEmpty === false && !$fieldDefinition->isEmpty($currentData)) {
try {
$fieldDefinition = $this->getFieldDefinition($valueContainer, $fieldName);
$currentDataIsEmpty = $fieldDefinition->isEmpty($currentData);
$newDataIsEmpty = $fieldDefinition->isEmpty($newData);
} catch (InvalidConfigurationException $e) {
$currentDataIsEmpty = empty($currentData);
$newDataIsEmpty = empty($newData);
}
kingjia90 marked this conversation as resolved.
Show resolved Hide resolved

if ($this->writeIfTargetIsNotEmpty === false && !$currentDataIsEmpty) {
return false;
}

if ($this->writeIfSourceIsEmpty === false && $fieldDefinition->isEmpty($newData)) {
if ($this->writeIfSourceIsEmpty === false && $newDataIsEmpty) {
return false;
}

Expand Down
Loading