Skip to content

Adding mergeAndMapAll function on Mapper.php #137

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
paulowinw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding mergeAndMapAll function on Mapper.php #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7c06d2
Adding mergeAndMapAll function on Mapper.php
Jul 18, 2023
b40d492
Adding unit test for the mapper class, but it needs to be reviewed
Jul 19, 2023
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
98 changes: 98 additions & 0 deletions Tests/Functional/Tools/Mapper/MapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,4 +374,102 @@ public function testMapAll(array $mappings, $mappingName, array $elements, $cont

$this->assertEquals($expectedValue, $res);
}

public function dataProviderForMergeAndMapAll()
{
$dataProviderFromMapAll = $this->dataProviderForMapAll();
$dataProviderForMergeAndMapAll = [
'Test mapping with array keys to merge' => [
'mappings' => [
'xy_to_xyz' => [
'x' => "obj.get('x') + 1",
'y' => "obj.get('x') + 2",
'z' => "obj.get('x') + 3",
],
],
'mapping_name' => 'xy_to_xyz',
'elements' => [
'x_10' => new SerializableArray(['x' => 10]),
'x_11' => new SerializableArray(['x' => 11]),
'x_12' => new SerializableArray(['x' => 12]),
'x_13_14' => new SerializableArray(['x' => [13, 14]]),
'x_15_16' => new SerializableArray(['x' => [15, 16]]),
],
'to_merge' => ['x_13_14', 'x_15_16'],
'context' => [],
'expected_value' => [
[
0 => [
'x_10' => [
'x' => 11,
'y' => 12,
'z' => 13,
],
'x_11' => [
'x' => 12,
'y' => 13,
'z' => 14,
],
'x_12' => [
'x' => 13,
'y' => 14,
'z' => 15,
],
'x_13_14' => [
'x' => 1, //TODO array + 1 = 1, it needs to be correct regarding the scenario of merging
'y' => 1,
'z' => 1,
],
],
1 => [
'x_10' => [
'x' => 11,
'y' => 12,
'z' => 13,
],
'x_11' => [
'x' => 12,
'y' => 13,
'z' => 14,
],
'x_12' => [
'x' => 13,
'y' => 14,
'z' => 15,
],
'x_15_16' => [
'x' => 1,
'y' => 1,
'z' => 1,
],
]
]
],
],
];

return array_merge($dataProviderFromMapAll, $dataProviderForMergeAndMapAll);
}

/**
* @covers ::mergeAndMapAll
* @covers ::map
* @covers ::addMappings
*
* @dataProvider dataProviderForMergeAndMapAll
*
* @param array $mappings
* @param $mappingName
* @param array $toMerge
* @param array $elements
* @param array $expectedValue
*/
public function testMergeAndMapAll(array $mappings, $mappingName, array $elements, array $toMerge, $context, array $expectedValue)
{
$this->mapper->addMappings($mappings);

$res = $this->mapper->mergeAndMapAll($elements, $mappingName, $context, $toMerge);

$this->assertEquals($expectedValue, $res);
}
}
53 changes: 52 additions & 1 deletion Tools/Mapper/Mapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,57 @@ public function mapAll($elements, $mappingName, $context = [], $disassociate = f
return $res;
}

/**
* @param array $elements
* @param string $mappingName
* @param array $toMerge
* @param array $context
* @param bool $disassociate
*
* @return array|mixed
*/
public function mergeAndMapAll($elements, $mappingName, $toMerge = [], $context = [], $disassociate = false)
{
if (!is_array($elements)) {
throw new \RuntimeException('mergeAndMapAll expected an array');
}

if (empty($elements)) {
return $elements;
}

$res = [];
foreach ($elements as $key => $element) {
$valuesToMerge = [];
foreach ($toMerge as $keyToMerge) {
if (array_key_exists($keyToMerge, $element)) {
$valuesToMerge[$keyToMerge] = $element[$keyToMerge];
unset($element[$keyToMerge]);
}
}
if (!empty($valuesToMerge)) {
$newElement = [];
foreach ($valuesToMerge as $keyToRemap => $valueToRemap) {
foreach($valueToRemap as $lineNum => $val) {
$newElement[$lineNum][$keyToRemap] = $val;
}
}

foreach ($newElement as $newKey => $newValue) {
$newElement[$newKey] = array_merge($element, $newValue);
}

$newElement = ($disassociate) ? ['key' => $key, 'value' => $newElement] : $newElement;
$res[$key] = $this->mapAll($newElement, $mappingName, $context);
} else {
$element = ($disassociate) ? ['key' => $key, 'value' => $element] : $element;
$res[$key] = $this->map($element, $mappingName, $context);
}
}

return $res;
}

/**
* Return true if the key exists in the given array.
*
Expand Down Expand Up @@ -281,7 +332,7 @@ protected function transformToSoapVar(&$item, $key)
public function arrayToSoapVars(array $data)
{
array_walk_recursive($data, [$this, 'transformToSoapVar']);

return $data;
}

Expand Down