Merge pull request #278 from Wojdylak/fix-channel-query-builder

Fix channel filter by switching to keyword field in ES query

Author: senghe

features/shop/searching_products_by_a_partial_name.feature

@@ -5,7 +5,7 @@ Feature: Filtering products
     I want to be able to filter products by specific criteria
 
     Background:
-        Given the store operates on a channel named "Web-US" in "USD" currency
+        Given the store operates on a single channel in "United States"
         And the store classifies its products as "Shirts"
         And there is a product named "Loose white designer T-Shirt" in the store
         And there is a product named "Everyday white basic T-Shirt" in the store

features/shop/site_wide_searching_products.feature

@@ -5,7 +5,7 @@ Feature: Site-wide products search
   I want to be able to search products across the entire catalog
 
   Background:
-    Given the store operates on a channel named "Web-US" in "USD" currency
+    Given the store operates on a single channel in "United States"
     And the store classifies its products as "Cars"
     And the store classifies its products as "Motorbikes"
     And the store has a select product attribute "Car Type" with values "Cabrio" and "SUV"

features/shop/site_wide_searching_products_113.feature

@@ -5,7 +5,7 @@ Feature: Site-wide products search
   I want to be able to search products across the entire catalog
 
   Background:
-    Given the store operates on a channel named "Web-US" in "USD" currency
+    Given the store operates on a single channel in "United States"
     And the store classifies its products as "Cars"
     And the store classifies its products as "Motorbikes"
     And the store has a select product attribute "Car Type" with values "Cabrio" and "SUV"

src/QueryBuilder/HasChannelQueryBuilder.php

@@ -26,10 +26,10 @@ public function __construct(
 
     public function buildQuery(array $data): ?AbstractQuery
     {
-        $channelQuery = new Terms($this->channelsProperty);
+        $channelQuery = new Terms(sprintf('%s.keyword', $this->channelsProperty));
         /** @var string $channelCode */
         $channelCode = $this->channelContext->getChannel()->getCode();
-        $channelQuery->setTerms([strtolower($channelCode)]);
+        $channelQuery->setTerms([$channelCode]);
 
         return $channelQuery;
     }