Commit 874f3637 authored by Pavel's avatar Pavel
Browse files

min should, keyword should filter

parent 5cab7843

src/ElasticSearch/Converter/CriteriaToEsRequest.php

+9 −1
Original line number Diff line number Diff line
@@ -206,6 +206,10 @@ final class CriteriaToEsRequest 
        $keywordFilter = new Query();

        foreach ($criteria->filters() as $filterGroup) {

            /** @var FilterGroupCollection $filterGroup */

            if ($filterGroup->isEmpty()) {

                continue;

            }

            $should = $filterGroup->getLogicalType()->value() === LogicOperator::OR;

            foreach ($filterGroup as $filter) {

                /** @var Filter $filter */

                $value = $filter->value()->value();
@@ -237,9 +241,13 @@ final class CriteriaToEsRequest 
                    $value = (string)$value;

                }



                if ($should) {

                    $keywordFilter->should(new FilterKeywordFacet($field, $value));

                } else {

                    $keywordFilter->filter(new FilterKeywordFacet($field, $value));

                }

            }

        }



        return $keywordFilter;

    }

src/ElasticSearch/Search/BoolQuery/Query.php

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ final class Query implements Esable 


        if (false === $this->should->isEmpty()) {

            $bool['should'] = $this->should->es();

            $bool['minimum_should_match'] = 1;

        }



        if (false === $this->match->isEmpty()) {