Merge remote-tracking branch 'origin/AC-14835' into spartans_pr_27102025

Author: glo60612

app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort/Position.php

@@ -69,6 +69,10 @@ public function build(AttributeAdapter $attribute, string $direction, RequestInt
             $fieldName = $this->fieldNameResolver->getFieldName($attribute);
         }
 
+        if ($fieldName !== '_script') {
+            $sortParams['unmapped_type'] = 'integer';
+        }
+
         return [$fieldName => $sortParams];
     }
 

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/Sort/PositionTest.php

@@ -60,7 +60,10 @@ public function testBuildWithoutCategoryIds(): void
             ->willReturn('position_category_2');
 
         $result = $this->position->build($attributeMock, 'desc', $requestMock);
-        self::assertEquals(['position_category_2' => ['order' => 'desc']], $result);
+        self::assertEquals(
+            ['position_category_2' => ['order' => 'desc', 'unmapped_type' => 'integer']],
+            $result
+        );
     }
 
     /**
@@ -90,7 +93,10 @@ public function testBuildWithSingleCategoryId(): void
             ->willReturn('position_category_5');
 
         $result = $this->position->build($attributeMock, 'desc', $requestMock);
-        self::assertEquals(['position_category_5' => ['order' => 'desc']], $result);
+        self::assertEquals(
+            ['position_category_5' => ['order' => 'desc', 'unmapped_type' => 'integer']],
+            $result
+        );
     }
 
     /**