Fixed orderBy does not works for scout. (#3230)

* Fixed orderBy does not works for scout.

* Added Test Cases

Author: limingxinleo

src/Searchable.php

@@ -158,10 +158,14 @@ public function getScoutModelsByIds(Builder $builder, array $ids)
         if ($builder->queryCallback) {
             call_user_func($builder->queryCallback, $query);
         }
+
+        $modelIdPositions = array_flip($ids);
         return $query->whereIn(
             $this->getScoutKeyName(),
             $ids
-        )->get();
+        )->get()->sortBy(static function ($model) use ($modelIdPositions) {
+            return $modelIdPositions[$model->getScoutKey()];
+        })->values();
     }
 
     /**

tests/Cases/ElasticsearchEngineTest.php

@@ -16,6 +16,7 @@
 use Hyperf\Scout\Builder;
 use Hyperf\Scout\Engine\ElasticsearchEngine;
 use HyperfTest\Scout\Stub\ElasticsearchEngineTestModel;
+use HyperfTest\Scout\Stub\SearchableModel;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 
@@ -119,6 +120,22 @@ function (\Elasticsearch\Client $client, $query, $params) {
         $engine->search($builder);
     }
 
+    public function testGetScoutModelsByIds()
+    {
+        $model = new SearchableModel();
+        $query = Mockery::mock(\Hyperf\Database\Model\Builder::class);
+        $query->shouldReceive('whereIn->get')->andReturn(new Collection([
+            new SearchableModel(['id' => 1]),
+            new SearchableModel(['id' => 2]),
+        ]));
+        $model->setQueryCallback(static function () use ($query) {
+            return $query;
+        });
+        $builder = Mockery::mock(Builder::class);
+        $res = $model->getScoutModelsByIds($builder, [2, 1]);
+        $this->assertSame([['id' => 2], ['id' => 1]], $res->toArray());
+    }
+
     public function testMapCorrectlyMapsResultsToModels()
     {
         $client = Mockery::mock('Elasticsearch\Client');

tests/Stub/SearchableModel.php

@@ -25,6 +25,11 @@ class SearchableModel extends Model
      */
     protected $fillable = ['id'];
 
+    /**
+     * @var \Closure
+     */
+    protected $queryCallback;
+
     public function searchableAs()
     {
         return 'table';
@@ -34,4 +39,17 @@ public function scoutMetadata()
     {
         return [];
     }
+
+    public function setQueryCallback(\Closure $closure)
+    {
+        $this->queryCallback = $closure;
+    }
+
+    public function newQuery()
+    {
+        if ($this->queryCallback) {
+            return $this->queryCallback->__invoke($this);
+        }
+        return parent::newQuery();
+    }
 }