From 6450515abe7fb4f08b98dc11034ebba0b108fc4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= <aurelien.foucret@smile.fr>
Date: Tue, 6 Feb 2018 16:26:50 +0100
Subject: [PATCH] Do not assume ES cast interger to boolean anymore

---
 .../Helper/AbstractAttribute.php               |  4 +++-
 .../Product/Indexer/Fulltext/Action/Full.php   |  2 ++
 .../etc/elasticsuite_analysis.xml              | 18 +++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/module-elasticsuite-catalog/Helper/AbstractAttribute.php b/src/module-elasticsuite-catalog/Helper/AbstractAttribute.php
index b214fbdc6..a46f18507 100644
--- a/src/module-elasticsuite-catalog/Helper/AbstractAttribute.php
+++ b/src/module-elasticsuite-catalog/Helper/AbstractAttribute.php
@@ -266,7 +266,9 @@ public function getFilterField(AttributeInterface $attribute)
      */
     private function prepareSimpleIndexAttributeValue(AttributeInterface $attribute, $value)
     {
-        if ($attribute->getBackendType() == 'decimal') {
+        if ($this->getFieldType($attribute) == FieldInterface::FIELD_TYPE_BOOLEAN) {
+            $value = boolval($value);
+        } elseif ($attribute->getBackendType() == 'decimal') {
             $value = floatval($value);
         } elseif ($attribute->getBackendType() == 'int') {
             $value = intval($value);
diff --git a/src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Action/Full.php b/src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Action/Full.php
index 8eb81ad29..62c911b6c 100644
--- a/src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Action/Full.php
+++ b/src/module-elasticsuite-catalog/Model/Product/Indexer/Fulltext/Action/Full.php
@@ -63,6 +63,8 @@ public function rebuildStoreIndex($storeId, $productIds = null)
 
             foreach ($products as $productData) {
                 $productId = (int) $productData['entity_id'];
+                $productData['has_options']      = (bool) $productData['has_options'];
+                $productData['required_options'] = (bool) $productData['required_options'];
                 yield $productId => $productData;
             }
         } while (!empty($products));
diff --git a/src/module-elasticsuite-core/etc/elasticsuite_analysis.xml b/src/module-elasticsuite-core/etc/elasticsuite_analysis.xml
index 62c62cd3a..ff806676b 100644
--- a/src/module-elasticsuite-core/etc/elasticsuite_analysis.xml
+++ b/src/module-elasticsuite-core/etc/elasticsuite_analysis.xml
@@ -27,21 +27,21 @@
         <filter name="trim" type="trim" language="default"/>
         <filter name="lowercase" type="lowercase" language="default"/>
         <filter name="word_delimiter" type="word_delimiter" language="default">
-            <generate_word_parts>1</generate_word_parts>
-            <catenate_words>1</catenate_words>
-            <catenate_numbers>1</catenate_numbers>
-            <catenate_all>1</catenate_all>
-            <split_on_case_change>1</split_on_case_change>
-            <split_on_numerics>1</split_on_numerics>
-            <preserve_original>1</preserve_original>
+            <generate_word_parts>true</generate_word_parts>
+            <catenate_words>true</catenate_words>
+            <catenate_numbers>true</catenate_numbers>
+            <catenate_all>true</catenate_all>
+            <split_on_case_change>true</split_on_case_change>
+            <split_on_numerics>true</split_on_numerics>
+            <preserve_original>true</preserve_original>
         </filter>
         <filter name="shingle" type="shingle" language="default">
             <min_shingle_size>2</min_shingle_size>
             <max_shingle_size>2</max_shingle_size>
-            <output_unigrams>0</output_unigrams>
+            <output_unigrams>false</output_unigrams>
         </filter>
         <filter name="ascii_folding" type="asciifolding" language="default">
-            <preserve_original>0</preserve_original>
+            <preserve_original>false</preserve_original>
         </filter>
         <filter name="standard" type="standard" language="default" />
         <filter name="standard" type="stemmer" language="ar">