Skip to content

magento#38805: Issue at product import when provided with custom options-type: file #38926

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

Merged
merged 3 commits into from
Sep 5, 2024
Merged

magento#38805: Issue at product import when provided with custom options-type: file #38926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df87854
magento#38805: Issue at product import when provided with custom opti…
Yaroslav1301 Jul 12, 2024
ee102d6
magento#38805: Fix for Static Test error "ExcessiveMethodLength"
Yaroslav1301 Jul 12, 2024
a4eab4c
Merge branch '2.4-develop' into fix-for-issue-38805
engcom-Hotel Jul 22, 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
20 changes: 18 additions & 2 deletions app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
'radio' => true,
'checkbox' => true,
'multiple' => true,
'file' => ['sku', 'file_extension', 'image_size_x', 'image_size_y'],
'file' => ['price', 'sku', 'file_extension', 'image_size_x', 'image_size_y'],
];

/**
Expand Down Expand Up @@ -2093,10 +2093,26 @@ protected function _parseCustomOptions($rowData)
$k = 0;
$name = '';
foreach ($optionValues as $optionValue) {
$separator = preg_quote($this->_productEntity->getMultipleValueSeparator(), '/');
$pattern = '/(?:^|' . $separator . ')file_extension=([a-zA-Z' . $separator . ']+)(?:' . $separator . '|$)/';

if (preg_match($pattern, $optionValue, $matches)) {
$fileExtNameAndValue = $matches[0];
$fileExtNameAndValue = ltrim($fileExtNameAndValue, $separator);
$optionValue = str_replace($fileExtNameAndValue, '', $optionValue);
$fileExtNameAndValue = rtrim($fileExtNameAndValue, $separator);
$optionValue = rtrim($optionValue, $separator);
}

$optionValueParams = explode($this->_productEntity->getMultipleValueSeparator(), $optionValue);

if (isset($fileExtNameAndValue)) {
$optionValueParams[] = $fileExtNameAndValue;
}

foreach ($optionValueParams as $nameAndValue) {
$nameAndValue = explode('=', $nameAndValue);
$value = isset($nameAndValue[1]) ? $nameAndValue[1] : '';
$value = $nameAndValue[1] ?? '';
$value = trim($value);
$fieldName = isset($nameAndValue[0]) ? trim($nameAndValue[0]) : '';
if ($value && ($fieldName === 'name')) {
Expand Down
114 changes: 114 additions & 0 deletions app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,120 @@ public static function validateRowStoreViewCodeFieldDataProvider(): array
];
}

/**
* Test parsing different option's type with _parseCustomOptions() method.
*
* @param array $rowData
* @param array $responseData
*
* @return void
* @dataProvider validateParseCustomOptionsDataProvider
* @throws \ReflectionException
*/
public function testValidateParseCustomOptions(array $rowData, array $responseData): void
{
$reflection = new \ReflectionClass(Option::class);
$reflectionMethod = $reflection->getMethod('_parseCustomOptions');
$result = $reflectionMethod->invoke($this->model, $rowData);
$this->assertEquals($responseData, $result);
}

/**
* Data provider for testValidateParseCustomOptions.
*
* @return array
*/
public static function validateParseCustomOptionsDataProvider(): array
{
return [
'file_type' => [
'$rowData' => [
'custom_options' => 'name=Test Field Title,type=file,required=1,'
. 'sku=1-text,price=12,file_extension=png,jpeg,jpg,gif,image_size_x=1024,'
. 'image_size_y=1024,price_type=fixed'
],
'$responseData' => [
'custom_options' => [
'Test Field Title' => [
[
'name' => 'Test Field Title',
'type' => 'file',
'required' => '1',
'sku' => '1-text',
'price' => '12',
'file_extension' => 'png,jpeg,jpg,gif',
'image_size_x' => '1024',
'image_size_y' => '1024',
'price_type' => 'fixed'
]
]
]
]
],
'drop_down' => [
'$rowData' => [
'custom_options' => 'name=Test Field Title,type=drop_down,required=0,'
. 'sku=1-text,price=10,price_type=fixed'
],
'$responseData' => [
'custom_options' => [
'Test Field Title' => [
[
'name' => 'Test Field Title',
'type' => 'drop_down',
'required' => '0',
'sku' => '1-text',
'price' => '10',
'price_type' => 'fixed'
]
]
]
]
],
'area' => [
'$rowData' => [
'custom_options' => 'name=Test Field Title,type=area,required=1,'
. 'sku=1-text,price=20,max_characters=150,price_type=fixed'
],
'$responseData' => [
'custom_options' => [
'Test Field Title' => [
[
'name' => 'Test Field Title',
'type' => 'area',
'required' => '1',
'sku' => '1-text',
'price' => '20',
'max_characters' => '150',
'price_type' => 'fixed'
]
]
]
]
],
'date_time' => [
'$rowData' => [
'custom_options' => 'name=Test Field Title,type=date_time,required=0,'
. 'sku=1-text,price=30,price_type=fixed'
],
'$responseData' => [
'custom_options' => [
'Test Field Title' => [
[
'name' => 'Test Field Title',
'type' => 'date_time',
'required' => '0',
'sku' => '1-text',
'price' => '30',
'price_type' => 'fixed'
]
]
]
]
]
];
}

/**
* Data provider of row data and errors.
*
Expand Down