src/ElasticSearch/Criteria/Order/OrderFactory.php

+<?php
+
+namespace IQDEV\ElasticSearch\Criteria\Order;
+
+use IQDEV\ElasticSearch\Document\Property\Property;
+use IQDEV\ElasticSearch\Document\Property\PropertyType;
+use IQDEV\ElasticSearch\Criteria\Order\Type\BaseOrder;
+use IQDEV\ElasticSearch\Criteria\Order\Type\KeywordPropertyOrder;
+use IQDEV\ElasticSearch\Criteria\Order\Type\NumberPropertyOrder;
+
+class OrderFactory
+{
+    public static function createByProperty(
+        Property $property,
+        OrderDirection $direction,
+    ): Order {
+        return match ($property->getType()) {
+            PropertyType::KEYWORD => new KeywordPropertyOrder($property, $direction),
+            PropertyType::NUMBER => new NumberPropertyOrder($property, $direction),
+            default => new BaseOrder($property, $direction),
+        };
+    }
+}

src/ElasticSearch/Criteria/Order/Type/BaseOrder.php

+<?php
+
+namespace IQDEV\ElasticSearch\Criteria\Order\Type;
+
+use IQDEV\ElasticSearch\Criteria\Order\Order;
+
+class BaseOrder extends Order
+{
+    public function es(): array
+    {
+        return array_merge(
+            [$this->property->getKey() => $this->direction->value],
+            $this->additionalParams
+        );
+    }
+}

src/ElasticSearch/Order/OrderKeywordProperty.php → src/ElasticSearch/Criteria/Order/Type/KeywordPropertyOrder.php

 <?php
 
-namespace IQDEV\ElasticSearch\Order;
+namespace IQDEV\ElasticSearch\Criteria\Order\Type;
 
-class OrderKeywordProperty extends Order
+use IQDEV\ElasticSearch\Criteria\Order\Order;
+
+class KeywordPropertyOrder extends Order
 {
     public function es(): array
     {
         $order = [
-            'order' => $this->direction::getType(),
+            'order' => $this->direction->value,
             'nested' => [
                 'path' => 'search_data',
                 'filter' => [
                     'bool' => [
                         'must' => [
                             'term' => [
-                                'search_data.keyword_facet.facet_code' => $this->by->key(),
-                            ]
+                                'search_data.keyword_facet.facet_code' => $this->property->getKey(),
+                            ],
                         ],
                     ],
                 ],
             ],
         ];
-        $order = array_merge($order, $this->properties);
+
         return [
-            'search_data.keyword_facet.facet_value' => $order,
+            'search_data.keyword_facet.facet_value' => array_merge(
+                $order,
+                $this->additionalParams
+            ),
         ];
     }
 }

src/ElasticSearch/Order/OrderNumberProperty.php → src/ElasticSearch/Criteria/Order/Type/NumberPropertyOrder.php

 <?php
 
-namespace IQDEV\ElasticSearch\Order;
+namespace IQDEV\ElasticSearch\Criteria\Order\Type;
 
-class OrderNumberProperty extends Order
+use IQDEV\ElasticSearch\Criteria\Order\Order;
+
+class NumberPropertyOrder extends Order
 {
     public function es(): array
     {
         $order = [
-            'order' => $this->direction::getType(),
+            'order' => $this->direction->value,
             'nested' => [
                 'path' => 'search_data',
                 'filter' => [
                     'bool' => [
                         'must' => [
                             'term' => [
-                                'search_data.number_facet.facet_code' => $this->by->key(),
-                            ]
+                                'search_data.number_facet.facet_code' => $this->property->getKey(),
+                            ],
                         ],
                     ],
                 ],
             ],
         ];
-        $order = array_merge($order, $this->properties);
+
         return [
-            'search_data.number_facet.facet_value' => $order,
+            'search_data.number_facet.facet_value' => array_merge(
+                $order,
+                $this->additionalParams
+            ),
         ];
     }
 }

src/ElasticSearch/Criteria/Pagination.php

+<?php
+
+namespace IQDEV\ElasticSearch\Criteria;
+
+final class Pagination
+{
+    public function __construct(
+        public int $limit = 20,
+        public int $offset = 0
+    ) {
+    }
+}

src/ElasticSearch/Criteria/Query/SearchQuery.php

+<?php
+
+namespace IQDEV\ElasticSearch\Criteria\Query;
+
+use IQDEV\ElasticSearch\Criteria\Criteria;
+
+final class SearchQuery
+{
+    public function __construct(
+        public Criteria $criteria
+    ) {
+    }
+}

src/ElasticSearch/Query/SearchQueryHandler.php → src/ElasticSearch/Criteria/Query/SearchQueryHandler.php

 <?php
 
-namespace IQDEV\ElasticSearch\Query;
+namespace IQDEV\ElasticSearch\Criteria\Query;
 
 use IQDEV\ElasticSearch\SearchService;
 
 final class SearchQueryHandler
 {
-    private SearchService $searchService;
-
-    public function __construct(SearchService $searchService)
-    {
-        $this->searchService = $searchService;
+    public function __construct(
+        private SearchService $searchService
+    ) {
     }
 
     public function handle(SearchQuery $q): SearchQueryResponse

src/ElasticSearch/Query/SearchQueryResponse.php → src/ElasticSearch/Criteria/Query/SearchQueryResponse.php

 <?php
 
-namespace IQDEV\ElasticSearch\Query;
+namespace IQDEV\ElasticSearch\Criteria\Query;
 
 use IQDEV\ElasticSearch\Result;
 
 final class SearchQueryResponse
 {
-    public Result $result;
-
-    public function __construct(Result $result)
-    {
-        $this->result = $result;
+    public function __construct(
+        public Result $result
+    ) {
     }
 }

src/ElasticSearch/Criteria/Search/Search.php

+<?php
+
+declare(strict_types=1);
+
+namespace IQDEV\ElasticSearch\Criteria\Search;
+
+use IQDEV\ElasticSearch\Document\Property\Property;
+
+class Search
+{
+    public function __construct(
+        private readonly Property $property,
+        private readonly mixed $value,
+    ) {
+    }
+
+    public function getProperty(): Property
+    {
+        return $this->property;
+    }
+
+    public function getValue(): mixed
+    {
+        return $this->value;
+    }
+}

src/ElasticSearch/Criteria/Search/SearchCollection.php

+<?php
+
+namespace IQDEV\ElasticSearch\Criteria\Search;
+
+use Ramsey\Collection\AbstractCollection;
+
+class SearchCollection extends AbstractCollection
+{
+    /**
+     * @inheritDoc
+     */
+    public function getType(): string
+    {
+        return Search::class;
+    }
+}

src/ElasticSearch/Criteria/Search/SearchQuery.php

+<?php
+
+declare(strict_types=1);
+
+namespace IQDEV\ElasticSearch\Criteria\Search;
+
+use IQDEV\ElasticSearch\Config\MappingValidator;
+use IQDEV\ElasticSearch\Configuration;
+use IQDEV\ElasticSearch\Criteria\Match\QueryMatch;
+use IQDEV\ElasticSearch\Search\BoolQuery\Query;
+use IQDEV\ElasticSearch\Search\BoolQuery\Terms;
+use IQDEV\ElasticSearch\Search\Nested;
+
+class SearchQuery
+{
+    public function __construct(
+        private readonly Search $search,
+    ) {
+    }
+
+    public function toQueryMatch(): QueryMatch
+    {
+        return new QueryMatch(
+            $this->search->getProperty()->getKey(),
+            $this->search->getValue(),
+        );
+    }
+
+    public function toMust(Configuration $configuration): Terms|Nested
+    {
+        if (MappingValidator::isPropertyExists($configuration, $this->search->getProperty()->getKey())) {
+
+            return new Terms($this->search->getProperty()->getKey(), $this->search->getValue());
+        } else {
+            $path = 'search_data.keyword_facet';
+
+            $nested = new Nested();
+
+            $query = new Query();
+            $query->getFilter()->add(new Terms($path . '.facet_code', $this->search->getProperty()->getKey()));
+            $query->getFilter()->add(new Terms($path . '.facet_value', $this->search->getValue()));
+
+            $nested
+                ->setPath($path)
+                ->setQuery($query);
+
+            return $nested;
+        }
+    }
+}

src/ElasticSearch/Document/Product.php

@@ -4,18 +4,10 @@ namespace IQDEV\ElasticSearch\Document;
 
 final class Product
 {
-    public string $id;
-    public string $title;
-    public array $info;
-
     public function __construct(
-        string $id,
-        string $title,
-        array  $info = []
-    )
-    {
-        $this->id = $id;
-        $this->title = $title;
-        $this->info = $info;
+        public string $id,
+        public string $title,
+        public array  $info = []
+    ) {
     }
 }

src/ElasticSearch/Document/ProductDocument.php

@@ -4,8 +4,8 @@ namespace IQDEV\ElasticSearch\Document;
 
 use IQDEV\ElasticSearch\Config\MappingValidator;
 use IQDEV\ElasticSearch\Configuration;
-use IQDEV\ElasticSearch\Facet\FacetCategory;
-use IQDEV\ElasticSearch\Facet\FacetCollection;
+use IQDEV\ElasticSearch\Facet\Collection\FacetCollection;
+use IQDEV\ElasticSearch\Facet\Facet;
 use IQDEV\ElasticSearch\Helper\ArrayHelper;
 
 class ProductDocument implements Document
@@ -17,21 +17,14 @@ class ProductDocument implements Document
     private array $info = [];
     private bool $skipEmpty = false;
 
-    private FacetCategory $categoryFacet;
-
-
     public function __construct(
-        FacetCategory $categoryFacet
-    )
-    {
+        private Facet $categoryFacet
+    ) {
         $this->keywordFacets = new FacetCollection();
         $this->numberFacets = new FacetCollection();
-
-        $this->categoryFacet = $categoryFacet;
-
     }
 
-    public static function create(FacetCategory $categoryFacet): self
+    public static function create(Facet $categoryFacet): self
     {
         return new self($categoryFacet);
     }
@@ -45,9 +38,9 @@ class ProductDocument implements Document
     }
 
     /**
-     * @return FacetCategory
+     * @return Facet
      */
-    public function getCategoryFacet(): FacetCategory
+    public function getCategoryFacet(): Facet
     {
         return $this->categoryFacet;
     }
@@ -120,7 +113,7 @@ class ProductDocument implements Document
 
         $result = array_replace_recursive($document, $this->properties);
         if (true === $this->skipEmpty) {
-            $result = ArrayHelper::array_filter_recursive($result);
+            $result = ArrayHelper::array_filter_recursive($result, static fn ($val) => $val !== null || $val === false);
         }
 
         return $result;

src/ElasticSearch/Document/Property/AttrType.php

-<?php
-
-namespace IQDEV\ElasticSearch\Document\Property;
-
-class AttrType implements Type
-{
-    protected string $key;
-    protected ?string $type;
-
-    public function __construct(string $key, ?string $type = null)
-    {
-        $this->key = $key;
-        $this->type = $type;
-    }
-
-    public function key(): string
-    {
-        return $this->key;
-    }
-
-    public function type(): ?string
-    {
-        return $this->type;
-    }
-
-    public static function types(): array
-    {
-        return [];
-    }
-}
\ No newline at end of file

src/ElasticSearch/Document/Property/Property.php

+<?php
+
+namespace IQDEV\ElasticSearch\Document\Property;
+
+class Property
+{
+    public function __construct(
+        protected string $key,
+        protected PropertyType $type = PropertyType::BASE,
+    ) {
+    }
+
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    public function getType(): PropertyType
+    {
+        return $this->type;
+    }
+}

src/ElasticSearch/Document/Property/PropertyType.php

@@ -2,39 +2,10 @@
 
 namespace IQDEV\ElasticSearch\Document\Property;
 
-class PropertyType implements Type
+enum PropertyType
 {
-    protected string $key;
-    protected string $type;
-
-    public const TYPE_NUMBER = 'number';
-    public const TYPE_KEYWORD = 'keyword';
-
-    public function __construct(string $key, string $type = null)
-    {
-        if (!in_array($type, self::types(), true)) {
-            throw new \InvalidArgumentException(sprintf('Invalid type "%s" for property "%s"', $type, $key));
-        }
-
-        $this->key = $key;
-        $this->type = $type;
-    }
-
-    public function key(): string
-    {
-        return $this->key;
-    }
-
-    public function type(): string
-    {
-        return $this->type;
-    }
-
-    public static function types(): array
-    {
-        return [
-            self::TYPE_NUMBER,
-            self::TYPE_KEYWORD,
-        ];
-    }
+    case BASE;
+    case KEYWORD;
+    case NUMBER;
+    case TEXT;
 }

src/ElasticSearch/Document/Property/Type.php

-<?php
-
-namespace IQDEV\ElasticSearch\Document\Property;
-
-interface Type
-{
-    public function key(): string;
-
-    public function type(): ?string;
-
-    /** @return string[] */
-    public static function types(): array;
-}

src/ElasticSearch/Facet/FacetCollection.php → src/ElasticSearch/Facet/Collection/FacetCollection.php

 <?php
 
-namespace IQDEV\ElasticSearch\Facet;
+namespace IQDEV\ElasticSearch\Facet\Collection;
 
 use IQDEV\ElasticSearch\Esable;
+use IQDEV\ElasticSearch\Facet\Facetable;
 use Ramsey\Collection\AbstractCollection;
 
 final class FacetCollection extends AbstractCollection implements Esable

src/ElasticSearch/Facet/Collection/FacetResultCollection.php

+<?php
+
+namespace IQDEV\ElasticSearch\Facet\Collection;
+
+use IQDEV\ElasticSearch\Facet\FacetResult;
+use Ramsey\Collection\AbstractCollection;
+
+final class FacetResultCollection extends AbstractCollection
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function getType(): string
+    {
+        return FacetResult::class;
+    }
+}

src/ElasticSearch/Facet/Facet.php

@@ -2,39 +2,18 @@
 
 namespace IQDEV\ElasticSearch\Facet;
 
-use IQDEV\ElasticSearch\Facet\Item\FacetItemCollection;
-use IQDEV\ElasticSearch\Facet\Type\FacetType;
+use IQDEV\ElasticSearch\Document\Property\Property;
 
-class Facet implements Facetable
+abstract class Facet implements Facetable
 {
-    public FacetItemCollection $products;
-
-    protected FacetType $type;
-
-    protected string $code;
-
-    public function __construct(FacetType $type, string $code)
-    {
-        $this->type = $type;
-        $this->code = $code;
-        $this->products = new FacetItemCollection();
-    }
-
-    public function getType(): FacetType
-    {
-        return $this->type;
-    }
-
-    public function getCode(): string
-    {
-        return $this->code;
+    public function __construct(
+        protected Property $property,
+        protected mixed $value,
+    ) {
     }
 
-    public function es(): array
+    public function getProperty(): Property
     {
-        return [
-            'facet_code' => $this->code,
-            'facet_value' => $this->type,
-        ];
+        return $this->property;
     }
 }