Merge pull request #81 from fedorf4/v8-add-unmapped-type-for-sort

v8 Added unmapped_type for sort

Author: MsNatali

src/Concerns/ExtendsSort.php

@@ -9,7 +9,7 @@
 /**
  * @psalm-require-implements \Ensi\LaravelElasticQuery\Contracts\SortableQuery
  *
- * @method static sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null)
+ * @method static sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null, ?string $unmappedType = null)
  */
 trait ExtendsSort
 {

src/Contracts/SortableQuery.php

@@ -7,7 +7,7 @@
 
 interface SortableQuery extends BoolQuery
 {
-    public function sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null): static;
+    public function sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null, ?string $unmappedType = null): static;
 
     public function minSortBy(string $field, string $order = SortOrder::ASC): static;
 

src/Search/SearchQuery.php

@@ -196,10 +196,10 @@ protected function parseHits(array $response): Collection
     //endregion
 
     //region Customization
-    public function sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null): static
+    public function sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null, ?string $unmappedType = null): static
     {
         (new SortBuilder($this->sorts))
-            ->sortBy($field, $order, $mode, $missingValues);
+            ->sortBy($field, $order, $mode, $missingValues, $unmappedType);
 
         return $this;
     }

src/Search/Sorting/Sort.php

@@ -19,6 +19,7 @@ public function __construct(
         private ?string $missingValues = null,
         private ?string $type = null,
         private ?Script $script = null,
+        private ?string $unmappedType = null,
     ) {
         Assert::stringNotEmpty(trim($field));
         Assert::oneOf($order, SortOrder::cases());
@@ -54,6 +55,10 @@ public function toDSL(): array
             $details['script'] = $this->script->toDSL();
         }
 
+        if ($this->unmappedType !== null) {
+            $details['unmapped_type'] = $this->unmappedType;
+        }
+
         if (!$details) {
             return [$this->field => $this->order];
         }

src/Search/Sorting/SortBuilder.php

@@ -28,7 +28,7 @@ public function __construct(SortCollection $sorts)
         $this->levels = new Collection();
     }
 
-    public function sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null): static
+    public function sortBy(string $field, string $order = SortOrder::ASC, ?string $mode = null, ?string $missingValues = null, ?string $unmappedType = null): static
     {
         $path = $this->absolutePath($field);
 
@@ -37,7 +37,8 @@ public function sortBy(string $field, string $order = SortOrder::ASC, ?string $m
             strtolower($order),
             $mode === null ? $mode : strtolower($mode),
             $this->buildNested(),
-            $missingValues
+            $missingValues,
+            unmappedType: $unmappedType
         );
 
         $this->sorts->add($sort);