SW-801 Export variants with different attribute values v1

src/Export/Adapters/AbstractSalesFrequencyAdapter.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Export\Data\SalesFrequency;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-abstract class AbstractSalesFrequencyAdapter
+abstract class AbstractSalesFrequencyAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): ?SalesFrequency
     {

src/Export/Adapters/AdapterFactory.php

@@ -22,6 +22,8 @@ class AdapterFactory
 
     private NameAdapter $nameAdapter;
 
+    private OptionsAdapter $optionsAdapter;
+
     private OrderNumberAdapter $orderNumberAdapter;
 
     private PriceAdapter $priceAdapter;
@@ -38,6 +40,8 @@ class AdapterFactory
 
     private UserGroupsAdapter $userGroupsAdapter;
 
+    private VariantConfigurationAdapter $variantConfigurationAdapter;
+
     public function __construct(
         AttributeAdapter $attributeAdapter,
         BonusAdapter $bonusAdapter,
@@ -47,14 +51,16 @@ public function __construct(
         ImagesAdapter $imagesAdapter,
         KeywordsAdapter $keywordsAdapter,
         NameAdapter $itemNameAdapter,
+        OptionsAdapter $optionsAdapter,
         OrderNumberAdapter $orderNumberAdapter,
         PriceAdapter $priceAdapter,
         AbstractSalesFrequencyAdapter $salesFrequencyAdapter,
         SortAdapter $sortAdapter,
         SummaryAdapter $summaryAdapter,
         ShopwarePropertiesAdapter $shopwarePropertiesAdapter,
         UrlAdapter $urlAdapter,
-        UserGroupsAdapter $userGroupsAdapter
+        UserGroupsAdapter $userGroupsAdapter,
+        VariantConfigurationAdapter $variantConfigurationAdapter
     ) {
         $this->attributeAdapter = $attributeAdapter;
         $this->bonusAdapter = $bonusAdapter;
@@ -64,6 +70,7 @@ public function __construct(
         $this->imagesAdapter = $imagesAdapter;
         $this->keywordsAdapter = $keywordsAdapter;
         $this->nameAdapter = $itemNameAdapter;
+        $this->optionsAdapter = $optionsAdapter;
         $this->orderNumberAdapter = $orderNumberAdapter;
         $this->priceAdapter = $priceAdapter;
         $this->salesFrequencyAdapter = $salesFrequencyAdapter;
@@ -72,6 +79,7 @@ public function __construct(
         $this->shopwarePropertiesAdapter = $shopwarePropertiesAdapter;
         $this->urlAdapter = $urlAdapter;
         $this->userGroupsAdapter = $userGroupsAdapter;
+        $this->variantConfigurationAdapter = $variantConfigurationAdapter;
     }
 
     public function getAttributeAdapter(): AttributeAdapter
@@ -114,6 +122,11 @@ public function getNameAdapter(): NameAdapter
         return $this->nameAdapter;
     }
 
+    public function getOptionsAdapter(): OptionsAdapter
+    {
+        return $this->optionsAdapter;
+    }
+
     public function getOrderNumbersAdapter(): OrderNumberAdapter
     {
         return $this->orderNumberAdapter;
@@ -153,4 +166,9 @@ public function getUserGroupsAdapter(): UserGroupsAdapter
     {
         return $this->userGroupsAdapter;
     }
+
+    public function getVariantConfigurationAdapter(): VariantConfigurationAdapter
+    {
+        return $this->variantConfigurationAdapter;
+    }
 }

src/Export/Adapters/AdapterInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FINDOLOGIC\Shopware6Common\Export\Adapters;
+
+use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
+
+interface AdapterInterface
+{
+    public function adapt(ProductEntity $product);
+}

src/Export/Adapters/AttributeAdapter.php

@@ -11,22 +11,21 @@
 use FINDOLOGIC\Shopware6Common\Export\Services\AbstractDynamicProductGroupService;
 use FINDOLOGIC\Shopware6Common\Export\Services\AbstractCatUrlBuilderService;
 use FINDOLOGIC\Shopware6Common\Export\Utils\Utils;
+use FINDOLOGIC\Shopware6Common\Traits\AdapterHelper;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Vin\ShopwareSdk\Data\Entity\Category\CategoryCollection;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
-use Vin\ShopwareSdk\Data\Entity\PropertyGroupOption\PropertyGroupOptionCollection;
-use Vin\ShopwareSdk\Data\Entity\PropertyGroupOption\PropertyGroupOptionEntity;
 
-class AttributeAdapter
+class AttributeAdapter implements AdapterInterface
 {
+    use AdapterHelper;
+
     protected AbstractDynamicProductGroupService $dynamicProductGroupService;
 
     protected AbstractCatUrlBuilderService $catUrlBuilderService;
 
     protected ExportContext $exportContext;
 
-    protected PluginConfig $pluginConfig;
-
     protected TranslatorInterface $translator;
 
     public function __construct(
@@ -149,68 +148,24 @@ protected function getManufacturerAttributes(ProductEntity $product): array
     }
 
     /**
-     * @return Attribute[]
-     */
-    protected function getPropertyAttributes(ProductEntity $product): array
-    {
-        if (!$product->properties || !$product->properties->count()) {
-            return [];
-        }
-
-        return $this->getPropertyGroupOptionAttributes($product->properties);
-    }
-
-    /**
+     * @deprecated tag:6.0.0 - Logic was moved to the OptionsAdapter
      * @return Attribute[]
      */
     protected function getOptionAttributes(ProductEntity $product): array
     {
-        if (!$product->options || !$product->options->count()) {
-            return [];
-        }
-
-        return $this->getPropertyGroupOptionAttributes($product->options);
+        return [];
     }
 
     /**
      * @return Attribute[]
      */
-    protected function getPropertyGroupOptionAttributes(PropertyGroupOptionCollection $collection): array
-    {
-        $attributes = [];
-
-        foreach ($collection as $propertyGroupOptionEntity) {
-            $group = $propertyGroupOptionEntity->group;
-            if ($group && !$group->filterable) {
-                continue;
-            }
-
-            $attributes = array_merge($attributes, $this->getAttributePropertyAsAttribute($propertyGroupOptionEntity));
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * @return Attribute[]
-     */
-    protected function getAttributePropertyAsAttribute(PropertyGroupOptionEntity $propertyGroupOptionEntity): array
+    protected function getPropertyAttributes(ProductEntity $product): array
     {
-        $attributes = [];
-
-        $group = $propertyGroupOptionEntity->group;
-        if ($group && $propertyGroupOptionEntity->getTranslation('name') && $group->getTranslation('name')) {
-            $groupName = $this->getAttributeKey($group->getTranslation('name'));
-            $propertyGroupOptionName = $propertyGroupOptionEntity->getTranslation('name');
-            if (!Utils::isEmpty($groupName) && !Utils::isEmpty($propertyGroupOptionName)) {
-                $propertyGroupAttrib = new Attribute($groupName);
-                $propertyGroupAttrib->addValue(Utils::removeControlCharacters($propertyGroupOptionName));
-
-                $attributes[] = $propertyGroupAttrib;
-            }
+        if (!$product->properties || !$product->properties->count()) {
+            return [];
         }
 
-        return $attributes;
+        return $this->getPropertyGroupOptionAttributes($product->properties);
     }
 
     protected function getCustomFieldAttributes(ProductEntity $product): array
@@ -282,19 +237,6 @@ protected function getAdditionalAttributes(ProductEntity $product): array
         return $attributes;
     }
 
-    /**
-     * For API Integrations, we have to remove special characters from the attribute key as a requirement for
-     * sending data via API.
-     */
-    protected function getAttributeKey(?string $key): ?string
-    {
-        if ($this->pluginConfig->isIntegrationTypeApi()) {
-            return Utils::removeSpecialChars($key);
-        }
-
-        return $key;
-    }
-
     /**
      * @param array<string, int, bool>|string|int|bool $value
      *

src/Export/Adapters/BonusAdapter.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Export\Data\Bonus;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class BonusAdapter
+class BonusAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): ?Bonus
     {

src/Export/Adapters/DateAddedAdapter.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Export\Data\DateAdded;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class DateAddedAdapter
+class DateAddedAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): ?DateAdded
     {

src/Export/Adapters/DefaultPropertiesAdapter.php

@@ -10,7 +10,7 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class DefaultPropertiesAdapter
+class DefaultPropertiesAdapter implements AdapterInterface
 {
     protected ExportContext $exportContext;
 

src/Export/Adapters/DescriptionAdapter.php

@@ -8,7 +8,7 @@
 use FINDOLOGIC\Shopware6Common\Export\Utils\Utils;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class DescriptionAdapter
+class DescriptionAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): ?Description
     {

src/Export/Adapters/ExportItemAdapter.php

@@ -136,13 +136,20 @@ public function adaptProduct(Item $item, ProductEntity $product): ?Item
             $item->addUsergroup($userGroup);
         }
 
+        foreach ($this->adapterFactory->getOptionsAdapter()->adapt($product) as $attribute) {
+            $item->addMergedAttribute($attribute);
+        }
+
         return $item;
     }
 
     public function adaptVariant(Item $item, ProductEntity $product): ?Item
     {
         if ($this->eventDispatcher) {
-            $this->eventDispatcher->dispatch(new BeforeVariantAdaptEvent($product, $item), BeforeVariantAdaptEvent::NAME);
+            $this->eventDispatcher->dispatch(
+                new BeforeVariantAdaptEvent($product, $item),
+                BeforeVariantAdaptEvent::NAME,
+            );
         }
 
         try {
@@ -157,6 +164,10 @@ public function adaptVariant(Item $item, ProductEntity $product): ?Item
             foreach ($this->adapterFactory->getShopwarePropertiesAdapter()->adapt($product) as $property) {
                 $item->addProperty($property);
             }
+
+            foreach ($this->adapterFactory->getVariantConfigurationAdapter()->adapt($product) as $attribute) {
+                $item->addMergedAttribute($attribute);
+            }
         } catch (Throwable $exception) {
             $exceptionLogger = new ExportExceptionLogger($this->logger);
             $exceptionLogger->log($product, $exception);

src/Export/Adapters/ImagesAdapter.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Export\Data\Image;
 use FINDOLOGIC\Shopware6Common\Export\Services\ProductImageService;
 
-class ImagesAdapter
+class ImagesAdapter implements AdapterInterface
 {
     protected ProductImageService $productImageService;
 

src/Export/Adapters/KeywordsAdapter.php

@@ -9,7 +9,7 @@
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 use FINDOLOGIC\Shopware6Common\Export\ExportContext;
 
-class KeywordsAdapter
+class KeywordsAdapter implements AdapterInterface
 {
     protected ExportContext $exportContext;
 

src/Export/Adapters/NameAdapter.php

@@ -9,7 +9,7 @@
 use FINDOLOGIC\Shopware6Common\Export\Utils\Utils;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class NameAdapter
+class NameAdapter implements AdapterInterface
 {
     /**
      * @throws ProductHasNoNameException

src/Export/Adapters/OptionsAdapter.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FINDOLOGIC\Shopware6Common\Export\Adapters;
+
+use FINDOLOGIC\Export\Data\Attribute;
+use FINDOLOGIC\Shopware6Common\Export\Config\PluginConfig;
+use FINDOLOGIC\Shopware6Common\Traits\AdapterHelper;
+use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
+
+class OptionsAdapter implements AdapterInterface
+{
+    use AdapterHelper;
+
+    public function __construct(PluginConfig $pluginConfig)
+    {
+        $this->pluginConfig = $pluginConfig;
+    }
+
+    /**
+     * @return Attribute[]
+     */
+    public function adapt(ProductEntity $product): array
+    {
+        if (!$product->options || !$product->options->count()) {
+            return [];
+        }
+
+        return $this->getPropertyGroupOptionAttributes($product->options);
+    }
+}

src/Export/Adapters/OrderNumberAdapter.php

@@ -8,7 +8,7 @@
 use FINDOLOGIC\Shopware6Common\Export\Utils\Utils;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class OrderNumberAdapter
+class OrderNumberAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): array
     {

src/Export/Adapters/PriceAdapter.php

@@ -10,7 +10,7 @@
 use FINDOLOGIC\Shopware6Common\Export\Utils\Utils;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class PriceAdapter
+class PriceAdapter implements AdapterInterface
 {
     protected ExportContext $exportContext;
 

src/Export/Adapters/ShopwarePropertiesAdapter.php

@@ -10,7 +10,7 @@
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 use Vin\ShopwareSdk\Data\Entity\PropertyGroupOption\PropertyGroupOptionEntity;
 
-class ShopwarePropertiesAdapter
+class ShopwarePropertiesAdapter implements AdapterInterface
 {
     protected PluginConfig $pluginConfig;
 

src/Export/Adapters/SortAdapter.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Export\Data\Sort;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class SortAdapter
+class SortAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): ?Sort
     {

src/Export/Adapters/SummaryAdapter.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Export\Data\Summary;
 use Vin\ShopwareSdk\Data\Entity\Product\ProductEntity;
 
-class SummaryAdapter
+class SummaryAdapter implements AdapterInterface
 {
     public function adapt(ProductEntity $product): ?Summary
     {