Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Add support for configurable value label. #81 #83

Merged
merged 1 commit into from
Jul 10, 2019
Merged

Add support for configurable value label. #81 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions CHANGELOG.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Changed ElasticSearch password to be obscured, encrypted, and considered sensitive (will dump to `env.php` instead of `config.php`) - [@rain2o](https://github.com/rain2o) ([#69](https://github.com/DivanteLtd/magento2-vsbridge-indexer/issues/69))
- Fix exporting values for multiselect option arrays as integers (instead of strings)
- Fix getting stock_status value for products
- Magento Commerce - fix getting configurable_children

### Changed/Improved
- Change mapping for "category.name" field in product type
Expand All @@ -24,6 +25,28 @@ category will be visible in menu sidebar.
- Add option to enable/disable exporting data to ES.
- Add ProductCategory indexer to partially update product data in ES (category, category_ids fields). Trigger after changing products positions in category.
- Add the ability to choose between Store ID and Store Code to be used at the end of index names.
- Add label for configurable option value. **Note:** When You modify any configurable attribute label or option label in Magento You should reindex all products manually.
```json
{
"attribute_id": 93,
"attribute_code": "color",
"label": "Color",
"values": [
{
"value_index": 61,
"label": "Gray"
},
{
"value_index": 66,
"label": "Purple"
},
{
"value_index": 69,
"label": "Yellow"
}
]
}
```
- Add new command ```php bin/magento vsbridge:reindex``` which will run all Magento indices which names start with "vsbridge_".
```php
Description:
Expand Down
218 changes: 133 additions & 85 deletions src/module-vsbridge-indexer-catalog/Index/Mapping/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,104 +165,152 @@ private function getCommonMappingProperties()
/**
* @return array
*/
private function getCustomProperties()
private function getCustomProperties(): array
{
return [
'attribute_set_id' => ['type' => FieldInterface::TYPE_LONG],
'bundle_options' => [
'properties' => [
'option_id' => ['type' => FieldInterface::TYPE_LONG],
'position' => ['type' => FieldInterface::TYPE_LONG],
'title' => ['type' => FieldInterface::TYPE_TEXT],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'product_links' => [
'properties' => [
'id' => ['type' => FieldInterface::TYPE_LONG],
'is_default' => ['type' => FieldInterface::TYPE_BOOLEAN],
'qty' => ['type' => FieldInterface::TYPE_DOUBLE],
'can_change_quantity' => ['type' => FieldInterface::TYPE_BOOLEAN],
'price' => ['type' => FieldInterface::TYPE_DOUBLE],
'price_type' => ['type' => FieldInterface::TYPE_TEXT],
'position' => ['type' => FieldInterface::TYPE_LONG],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
],
],
],
'bundle_options' => $this->getBundleOptionsMapping(),
'product_links' => $this->getProductLinksMapping(),
'configurable_options' => $this->getConfigurableOptionsMapping(),
'category' => $this->getCategoryMapping(),
'custom_options' => $this->getCustomOptionsMapping(),
'tier_prices' => $this->getTierPricesMapping(),
];
}

/**
* @return array
*/
private function getProductLinksMapping(): array
{
return [
'properties' => [
'linked_product_type' => ['type' => FieldInterface::TYPE_TEXT],
'linked_product_sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'position' => ['type' => FieldInterface::TYPE_LONG],
],
'product_links' => [
'properties' => [
'linked_product_type' => ['type' => FieldInterface::TYPE_TEXT],
'linked_product_sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'position' => ['type' => FieldInterface::TYPE_LONG],
];
}

/**
* @return array
*/
private function getConfigurableOptionsMapping(): array
{
return [
'properties' => [
'label' => ['type' => FieldInterface::TYPE_TEXT],
'id' => ['type' => FieldInterface::TYPE_LONG],
'product_id' => ['type' => FieldInterface::TYPE_LONG],
'attribute_code' => ['type' => FieldInterface::TYPE_TEXT],
'attribute_id' => ['type' => FieldInterface::TYPE_LONG],
'position' => ['type' => FieldInterface::TYPE_LONG],
'values' => [
'properties' => [
'value_index' => ['type' => FieldInterface::TYPE_KEYWORD],
],
],
],
'configurable_options' => [
'properties' => [
'label' => ['type' => FieldInterface::TYPE_TEXT],
'id' => ['type' => FieldInterface::TYPE_LONG],
'product_id' => ['type' => FieldInterface::TYPE_LONG],
'attribute_code' => ['type' => FieldInterface::TYPE_TEXT],
'attribute_id' => ['type' => FieldInterface::TYPE_LONG],
'position' => ['type' => FieldInterface::TYPE_LONG],
'values' => [
'properties' => [
'value_index' => ['type' => FieldInterface::TYPE_KEYWORD],
],
];
}

/**
* @return array
*/
private function getCategoryMapping(): array
{
return [
'type' => 'nested',
'properties' => [
'category_id' => ['type' => FieldInterface::TYPE_LONG],
'position' => ['type' => FieldInterface::TYPE_LONG],
'name' => [
'type' => FieldInterface::TYPE_TEXT,
'fields' => [
'keyword' => [
'type' => FieldInterface::TYPE_KEYWORD,
'ignore_above' => 256,
]
],
],
],
'category' => [
'type' => 'nested',
'properties' => [
'category_id' => ['type' => FieldInterface::TYPE_LONG],
'position' => ['type' => FieldInterface::TYPE_LONG],
'name' => [
'type' => FieldInterface::TYPE_TEXT,
'fields' => [
'keyword' => [
'type' => FieldInterface::TYPE_KEYWORD,
'ignore_above' => 256,
]
],
];
}

/**
* @return array
*/
private function getBundleOptionsMapping(): array
{
return [
'properties' => [
'option_id' => ['type' => FieldInterface::TYPE_LONG],
'position' => ['type' => FieldInterface::TYPE_LONG],
'title' => ['type' => FieldInterface::TYPE_TEXT],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'product_links' => [
'properties' => [
'id' => ['type' => FieldInterface::TYPE_LONG],
'is_default' => ['type' => FieldInterface::TYPE_BOOLEAN],
'qty' => ['type' => FieldInterface::TYPE_DOUBLE],
'can_change_quantity' => ['type' => FieldInterface::TYPE_BOOLEAN],
'price' => ['type' => FieldInterface::TYPE_DOUBLE],
'price_type' => ['type' => FieldInterface::TYPE_TEXT],
'position' => ['type' => FieldInterface::TYPE_LONG],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
],
],
],
'custom_options' => [
'properties' => [
'image_size_x' => ['type' => FieldInterface::TYPE_TEXT],
'image_size_y' => ['type' => FieldInterface::TYPE_TEXT],
'file_extension' => ['type' => FieldInterface::TYPE_TEXT],
'is_require' => ['type' => FieldInterface::TYPE_BOOLEAN],
'max_characters' => ['type' => FieldInterface::TYPE_TEXT],
'option_id' => ['type' => FieldInterface::TYPE_LONG],
'price' => ['type' => FieldInterface::TYPE_DOUBLE],
'price_type' => ['type' => FieldInterface::TYPE_TEXT],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'sort_order' => ['type' => FieldInterface::TYPE_LONG],
'title' => ['type' => FieldInterface::TYPE_TEXT],
'type' => ['type' => FieldInterface::TYPE_TEXT],
'values' => [
'properties' => [
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'price' => ['type' => FieldInterface::TYPE_DOUBLE],
'title' => ['type' => FieldInterface::TYPE_TEXT],
'price_type' => ['type' => FieldInterface::TYPE_TEXT],
'sort_order' => ['type' => FieldInterface::TYPE_LONG],
'option_type_id' => ['type' => FieldInterface::TYPE_INTEGER],
]
]
];
}

/**
* @return array
*/
private function getCustomOptionsMapping(): array
{
return [
'properties' => [
'image_size_x' => ['type' => FieldInterface::TYPE_TEXT],
'image_size_y' => ['type' => FieldInterface::TYPE_TEXT],
'file_extension' => ['type' => FieldInterface::TYPE_TEXT],
'is_require' => ['type' => FieldInterface::TYPE_BOOLEAN],
'max_characters' => ['type' => FieldInterface::TYPE_TEXT],
'option_id' => ['type' => FieldInterface::TYPE_LONG],
'price' => ['type' => FieldInterface::TYPE_DOUBLE],
'price_type' => ['type' => FieldInterface::TYPE_TEXT],
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'sort_order' => ['type' => FieldInterface::TYPE_LONG],
'title' => ['type' => FieldInterface::TYPE_TEXT],
'type' => ['type' => FieldInterface::TYPE_TEXT],
'values' => [
'properties' => [
'sku' => ['type' => FieldInterface::TYPE_KEYWORD],
'price' => ['type' => FieldInterface::TYPE_DOUBLE],
'title' => ['type' => FieldInterface::TYPE_TEXT],
'price_type' => ['type' => FieldInterface::TYPE_TEXT],
'sort_order' => ['type' => FieldInterface::TYPE_LONG],
'option_type_id' => ['type' => FieldInterface::TYPE_INTEGER],
]
]
],
'tier_prices' => [
'properties' => [
'customer_group_d' => ['type' => FieldInterface::TYPE_INTEGER],
'qty' => ['type' => FieldInterface::TYPE_DOUBLE],
'value' => ['type' => FieldInterface::TYPE_DOUBLE],
'extension_attributes' => [
'properties' => [
'website_id' => ['type' => FieldInterface::TYPE_INTEGER]
],
]
];
}

/**
* @return array
*/
private function getTierPricesMapping(): array
{
return [
'properties' => [
'customer_group_d' => ['type' => FieldInterface::TYPE_INTEGER],
'qty' => ['type' => FieldInterface::TYPE_DOUBLE],
'value' => ['type' => FieldInterface::TYPE_DOUBLE],
'extension_attributes' => [
'properties' => [
'website_id' => ['type' => FieldInterface::TYPE_INTEGER]
],
],
],
Expand Down
79 changes: 79 additions & 0 deletions src/module-vsbridge-indexer-catalog/Model/Attribute/LoadOptionLabelById.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?php

declare(strict_types = 1);

/**
* @package Divante\VsbridgeIndexerCatalog
* @author Agata Firlejczyk <afirlejczyk@divante.pl>
* @copyright 2019 Divante Sp. z o.o.
* @license See LICENSE_DIVANTE.txt for license details.
*/

namespace Divante\VsbridgeIndexerCatalog\Model\Attribute;

use Divante\VsbridgeIndexerCatalog\Model\ResourceModel\Product\AttributeDataProvider;
use Magento\Catalog\Model\ResourceModel\Eav\Attribute;

/**
* Class LoadOptionLabelById
*/
class LoadOptionLabelById
{
/**
* @var AttributeDataProvider
*/
private $attributeDataProvider;

/**
* @var array
*/
private $optionsByAttribute = [];

/**
* LoadLabelByOptionId constructor.
*
* @param AttributeDataProvider $attributeDataProvider
*/
public function __construct(AttributeDataProvider $attributeDataProvider)
{
$this->attributeDataProvider = $attributeDataProvider;
}

/**
* @param string $attributeCode
* @param int $optionId
* @param int $storeId
*
* @return string
*/
public function execute(string $attributeCode, int $optionId, int $storeId): string
{
$attributeModel = $this->attributeDataProvider->getAttributeByCode($attributeCode);
$attributeModel->setStoreId($storeId);
$options = $this->loadOptions($attributeModel);

foreach ($options as $option) {
if ($optionId === (int)$option['value']) {
return $option['label'];
}
}

return '';
}

/**
* @param Attribute $attribute
*
* @return mixed
*/
private function loadOptions(Attribute $attribute)
{
$key = $attribute->getId() . '_' . $attribute->getStoreId();

if (!isset($this->optionsByAttribute[$key])) {
$this->optionsByAttribute[$key] = $attribute->getOptions();
}

return $this->optionsByAttribute[$key];
}
}
Loading