💥

Author: Spamercz

src/ElasticQuery.php

@@ -35,7 +35,7 @@ class ElasticQuery implements \Spameri\ElasticQuery\Entity\ArrayInterface
 	public function __construct(
 		?\Spameri\ElasticQuery\Query\QueryCollection $query = NULL
 		, ?\Spameri\ElasticQuery\Filter\FilterCollection $filter = NULL
-		, $sort = NULL
+		, \Spameri\ElasticQuery\Options\SortCollection $sort = NULL
 		, $aggregation = NULL
 		, int $from = NULL
 		, int $size = NULL
@@ -75,7 +75,7 @@ public function toArray() : array
 		}
 
 		if ($this->sort) {
-			$array['sort'] = $this->sort;
+			$array['sort'] = $this->sort->toArray();
 		}
 
 		if ($this->aggregation) {

src/Options/Sort.php

@@ -0,0 +1,59 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery\Options;
+
+
+class Sort extends \Spameri\ElasticQuery\Entity\AbstractEntity
+{
+	public const ASC = 'ASC';
+	public const DESC = 'DESC';
+
+	/**
+	 * @var string
+	 */
+	private $field;
+	/**
+	 * @var string
+	 */
+	private $type;
+	/**
+	 * @var string
+	 */
+	private $missing;
+
+
+	public function __construct(
+		string $field
+		, string $type = self::DESC
+		, string $missing = '_last'
+	)
+	{
+		if ( ! \in_array($type, [self::ASC, self::DESC], TRUE)) {
+			throw new \Spameri\ElasticQuery\Exception\InvalidArgumentException(
+				'Sorting type ' . $type . ' is out of allowed range. See \Spameri\ElasticQuery\Options\Sort for reference.'
+			);
+		}
+
+		$this->field = $field;
+		$this->type = $type;
+		$this->missing = $missing;
+	}
+
+
+	public function key() : string
+	{
+		return $this->field;
+	}
+
+
+	public function toArray() : array
+	{
+		return [
+			$this->field => [
+				'order' => $this->type,
+				'missing' => $this->missing,
+			],
+		];
+	}
+
+}

src/Options/SortCollection.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery\Options;
+
+
+class SortCollection extends \Spameri\ElasticQuery\Query\AbstractLeafQuery
+{
+
+	/**
+	 * @var \Spameri\ElasticQuery\Options\Sort[]
+	 */
+	private $collection;
+
+
+	public function __construct(
+		Sort ... $collection
+	)
+	{
+		$this->collection = $collection;
+	}
+
+
+	public function key() : string
+	{
+		return '';
+	}
+
+
+	public function toArray() : array
+	{
+		$array = [];
+
+		foreach ($this->collection as $sort) {
+			$array[] = $sort->toArray();
+		}
+
+		return $array;
+	}
+
+}

src/Query/MustNotCollection.php

@@ -0,0 +1,92 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery\Query;
+
+
+class MustNotCollection implements \Spameri\ElasticQuery\Collection\CollectionInterface
+{
+
+	/**
+	 * @var \Spameri\ElasticQuery\Query\AbstractLeafQuery[]
+	 */
+	private $collection;
+
+
+	public function __construct(
+		\Spameri\ElasticQuery\Query\AbstractLeafQuery ... $collection
+	)
+	{
+		$this->collection = $collection;
+	}
+
+
+	public function add(
+		\Spameri\ElasticQuery\Query\AbstractLeafQuery $item
+	) : void
+	{
+		$this->collection[$item->key()] = $item;
+	}
+
+
+	public function remove(
+		string $key
+	) : bool
+	{
+		if (isset($this->collection[$key])) {
+			unset($this->collection[$key]);
+
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+
+	public function get(
+		string $key
+	) : ?\Spameri\ElasticQuery\Query\AbstractLeafQuery
+	{
+		if (isset($this->collection[$key])) {
+			return $this->collection[$key];
+		}
+
+		return NULL;
+	}
+
+
+	public function isValue(
+		string $key
+	) : bool
+	{
+		if (isset($this->collection[$key])) {
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+
+	public function count() : int
+	{
+		return \count($this->collection);
+	}
+
+
+	public function keys() : array
+	{
+		return \array_map('\strval', \array_keys($this->collection));
+	}
+
+
+	public function clear() : void
+	{
+		$this->collection = [];
+	}
+
+
+	public function getIterator() : \ArrayIterator
+	{
+		return new \ArrayIterator($this->collection);
+	}
+
+}

src/Query/QueryCollection.php

@@ -14,23 +14,33 @@ class QueryCollection extends \Spameri\ElasticQuery\Query\AbstractLeafQuery
 	 * @var \Spameri\ElasticQuery\Query\ShouldCollection
 	 */
 	private $shouldCollection;
+	/**
+	 * @var null|\Spameri\ElasticQuery\Query\MustNotCollection
+	 */
+	private $mustNotCollection;
 
 
 	public function __construct(
 		?\Spameri\ElasticQuery\Query\MustCollection $mustCollection = NULL,
-		?\Spameri\ElasticQuery\Query\ShouldCollection $shouldCollection = NULL
+		?\Spameri\ElasticQuery\Query\ShouldCollection $shouldCollection = NULL,
+		?\Spameri\ElasticQuery\Query\MustNotCollection $mustNotCollection = NULL
 	)
 	{
 		if ( ! $mustCollection) {
 			$mustCollection = new \Spameri\ElasticQuery\Query\MustCollection();
 		}
 
+		if ( ! $mustNotCollection) {
+			$mustNotCollection = new \Spameri\ElasticQuery\Query\MustNotCollection();
+		}
+
 		if ( ! $shouldCollection) {
 			$shouldCollection = new \Spameri\ElasticQuery\Query\ShouldCollection();
 		}
 
 		$this->mustCollection = $mustCollection;
 		$this->shouldCollection = $shouldCollection;
+		$this->mustNotCollection = $mustNotCollection;
 	}
 
 
@@ -59,6 +69,12 @@ public function toArray() : array
 		foreach ($this->mustCollection as $item) {
 			$array['bool']['must'][] = $item->toArray();
 		}
+
+		/** @var \Spameri\ElasticQuery\Query\AbstractLeafQuery $item */
+		foreach ($this->mustNotCollection as $item) {
+			$array['bool']['must_not'][] = $item->toArray();
+		}
+
 		/** @var \Spameri\ElasticQuery\Query\AbstractLeafQuery $item */
 		foreach ($this->shouldCollection as $item) {
 			$array['bool']['should'][] = $item->toArray();

src/Query/Terms.php

@@ -26,6 +26,12 @@ public function __construct(
 		float $boost = 1.0
 	)
 	{
+		if ( ! \count($query)) {
+			throw new \Spameri\ElasticQuery\Exception\InvalidArgumentException(
+				'Terms query must contain values, empty array given.'
+			);
+		}
+
 		$this->field = $field;
 		$this->query = $query;
 		$this->boost = $boost;