Fix repository

Author: bitbager

src/EntityRepository/ProductVariantRepository.php

@@ -41,6 +41,7 @@ public function findOneByOptionValue(ProductOptionValueInterface $productOptionV
             ->where(':optionValue MEMBER OF o.optionValues')
             ->setParameter('optionValue', $productOptionValue)
             ->getQuery()
+            ->setMaxResults(1)
             ->getOneOrNullResult()
         ;
 

src/Form/Type/ChoiceMapper/ProductOptionsMapper.php

@@ -12,20 +12,38 @@
 
 namespace BitBag\SyliusElasticsearchPlugin\Form\Type\ChoiceMapper;
 
+use BitBag\SyliusElasticsearchPlugin\Formatter\StringFormatterInterface;
 use Sylius\Component\Product\Model\ProductOptionInterface;
 use Sylius\Component\Product\Model\ProductOptionValueInterface;
 
 final class ProductOptionsMapper implements ProductOptionsMapperInterface
 {
+    /**
+     * @var StringFormatterInterface
+     */
+    private $stringFormatter;
+
+    /**
+     * @param StringFormatterInterface $stringFormatter
+     */
+    public function __construct(StringFormatterInterface $stringFormatter)
+    {
+        $this->stringFormatter = $stringFormatter;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function mapToChoices(ProductOptionInterface $productOption): array
     {
-        $optionValues = array_map(function (ProductOptionValueInterface $productOptionValue): ?string {
-            return $productOptionValue->getValue();
-        }, $productOption->getValues()->toArray());
+        $productOptionValues = $productOption->getValues()->toArray();
+        $choices = [];
+
+        array_walk($productOptionValues, function (ProductOptionValueInterface $productOptionValue) use (&$choices) {
+            $value = $productOptionValue->getValue();
+            $choices[$value] = $this->stringFormatter->formatToLowercaseWithoutSpaces($value);
+        });
 
-        return array_combine($optionValues, $optionValues);
+        return $choices;
     }
 }

src/PropertyBuilder/OptionBuilder.php

@@ -12,6 +12,7 @@
 
 namespace BitBag\SyliusElasticsearchPlugin\PropertyBuilder;
 
+use BitBag\SyliusElasticsearchPlugin\Formatter\StringFormatterInterface;
 use BitBag\SyliusElasticsearchPlugin\PropertyNameResolver\ConcatedNameResolverInterface;
 use Elastica\Document;
 use FOS\ElasticaBundle\Event\TransformEvent;
@@ -24,12 +25,19 @@ final class OptionBuilder extends AbstractBuilder
      */
     private $optionNameResolver;
 
+    /**
+     * @var StringFormatterInterface
+     */
+    private $stringFormatter;
+
     /**
      * @param ConcatedNameResolverInterface $optionNameResolver
+     * @param StringFormatterInterface $stringFormatter
      */
-    public function __construct(ConcatedNameResolverInterface $optionNameResolver)
+    public function __construct(ConcatedNameResolverInterface $optionNameResolver, StringFormatterInterface $stringFormatter)
     {
         $this->optionNameResolver = $optionNameResolver;
+        $this->stringFormatter = $stringFormatter;
     }
 
     /**
@@ -65,7 +73,7 @@ private function resolveProductOptions(ProductInterface $product, Document $docu
                 }
 
                 $reference = $document->get($index);
-                $value = $productOptionValue->getValue();
+                $value = $this->stringFormatter->formatToLowercaseWithoutSpaces($productOptionValue->getValue());
                 $reference[] = $value;
 
                 $document->set($index, array_unique($reference));

src/Resources/config/services/form.yml

@@ -38,6 +38,8 @@ services:
 
     bitbag_sylius_elasticsearch_plugin.form.type.choice_mapper.product_options:
         class: BitBag\SyliusElasticsearchPlugin\Form\Type\ChoiceMapper\ProductOptionsMapper
+        arguments:
+            - "@bitbag.sylius_elasticsearch_plugin.string_formatter"
 
     bitbag_sylius_elasticsearch_plugin.form.type.choice_mapper.product_attributes:
         class: BitBag\SyliusElasticsearchPlugin\Form\Type\ChoiceMapper\ProductAttributesMapper

src/Resources/config/services/property_builder.yml

@@ -14,6 +14,7 @@ services:
         class: BitBag\SyliusElasticsearchPlugin\PropertyBuilder\OptionBuilder
         arguments:
            - "@bitbag_sylius_elasticsearch_plugin.property_name_resolver.option"
+           - "@bitbag.sylius_elasticsearch_plugin.string_formatter"
         tags:
             - { name: kernel.event_subscriber }