EscapeDependence | Refactor (bac145ea) · Commits · Pavel / search-es

src/ElasticSearch/Converter/CriteriaToEsRequest.php

+10 −10

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ final class CriteriaToEsRequest
		$field = $filter->field()->value();

		if ('search' === $field) {
		if ($filter->operator()->value() === FilterOperator::CONTAINS) {
		if ($filter->operator() === FilterOperator::CONTAINS) {
		$request->addMatch(
		'suggest_search_content',
		[
		@@ -167,7 +167,7 @@ final class CriteriaToEsRequest
		if ($filterGroup->isEmpty()) {
		continue;
		}
		$group = $filterGroup->getLogicalType()->value() === LogicOperator::OR ? count($ranges) + 1 : 0;
		$group = $filterGroup->getLogicOperator() === LogicOperator::OR ? count($ranges) + 1 : 0;
		if (!isset($ranges[$group])) {
		$ranges[$group] = [];
		}
		@@ -179,13 +179,13 @@ final class CriteriaToEsRequest
		if (in_array($field, $excludeFilter, true)) {
		continue;
		}
		if (in_array($filter->operator()->value(), [FilterOperator::LT, FilterOperator::LTE], true)) {
		$ranges[$group][$field][$filter->operator()->value()] = $value;
		if (in_array($filter->operator(), [FilterOperator::LT, FilterOperator::LTE], true)) {
		$ranges[$group][$field][$filter->operator()->value] = $value;
		continue;
		}

		if (in_array($filter->operator()->value(), [FilterOperator::GT, FilterOperator::GTE], true)) {
		$ranges[$group][$field][$filter->operator()->value()] = $value;
		if (in_array($filter->operator(), [FilterOperator::GT, FilterOperator::GTE], true)) {
		$ranges[$group][$field][$filter->operator()->value] = $value;
		}
		}
		}
		@@ -223,7 +223,7 @@ final class CriteriaToEsRequest
		if ($filterGroup->isEmpty()) {
		continue;
		}
		$should = $filterGroup->getLogicalType()->value() === LogicOperator::OR;
		$should = $filterGroup->getLogicOperator() === LogicOperator::OR;
		foreach ($filterGroup as $filter) {
		/** @var Filter $filter */
		$value = $filter->value()->value();
		@@ -233,11 +233,11 @@ final class CriteriaToEsRequest
		continue;
		}

		if (in_array($filter->operator()->value(), [FilterOperator::LT, FilterOperator::LTE], true)) {
		if (in_array($filter->operator(), [FilterOperator::LT, FilterOperator::LTE], true)) {
		continue;
		}

		if (in_array($filter->operator()->value(), [FilterOperator::GT, FilterOperator::GTE], true)) {
		if (in_array($filter->operator(), [FilterOperator::GT, FilterOperator::GTE], true)) {
		continue;
		}

		@@ -301,7 +301,7 @@ final class CriteriaToEsRequest
		continue;
		}

		if (in_array($filter->operator()->value(), [], true)) {
		if (in_array($filter->operator(), [], true)) {
		continue;
		}

src/ElasticSearch/Document/Product.php

+4 −12

Original line number	Diff line number	Diff line
		@@ -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

+2 −9

Original line number	Diff line number	Diff line
		@@ -17,18 +17,11 @@ class ProductDocument implements Document
		private array $info = [];
		private bool $skipEmpty = false;

		private Facet $categoryFacet;


		public function __construct(
		Facet $categoryFacet
		)
		{
		private Facet $categoryFacet
		) {
		$this->keywordFacets = new FacetCollection();
		$this->numberFacets = new FacetCollection();

		$this->categoryFacet = $categoryFacet;

		}

		public static function create(Facet $categoryFacet): self

src/ElasticSearch/Filter/Collection/FilterCollection.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ class FilterCollection extends AbstractCollection
		public function __construct(array $data = [])
		{
		parent::__construct($data);
		$this->type = new LogicOperator(LogicOperator::AND);
		$this->type = LogicOperator::AND;
		}

		/**

src/ElasticSearch/Filter/Collection/FilterGroupCollection.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ use Ramsey\Collection\AbstractCollection;
		class FilterGroupCollection extends AbstractCollection
		{
		/** @var LogicOperator Тип логической операции для коллекции */
		protected LogicOperator $type;
		protected LogicOperator $logicOperator;
		/** @var FilterType Тип фильтра для коллекции */
		protected FilterType $filterType;

		@@ -23,7 +23,7 @@ class FilterGroupCollection extends AbstractCollection
		public function __construct(array $data = [])
		{
		parent::__construct($data);
		$this->type = new LogicOperator(LogicOperator::AND);
		$this->logicOperator = LogicOperator::AND;
		$this->filterType = FilterType::post();
		}

		@@ -42,9 +42,9 @@ class FilterGroupCollection extends AbstractCollection
		*
		* @return $this
		*/
		public function setLogicalType(LogicOperator $type): self
		public function setLogicOperator(LogicOperator $type): self
		{
		$this->type = $type;
		$this->logicOperator = $type;

		return $this;
		}
		@@ -54,9 +54,9 @@ class FilterGroupCollection extends AbstractCollection
		*
		* @return LogicOperator
		*/
		public function getLogicalType(): LogicOperator
		public function getLogicOperator(): LogicOperator
		{
		return $this->type;
		return $this->logicOperator;
		}

		/**