[MODEL] Ensure that specified ActiveRecord order is not overwritten by Elasticsearch query order

Author: estolfo

elasticsearch-model/lib/elasticsearch/model/adapters/active_record.rb

@@ -35,7 +35,11 @@ def records
                 else
                   self.__send__(:exec_queries)
                 end
-                @records.sort_by { |record| hits.index { |hit| hit['_id'].to_s == record.id.to_s } }
+                if !self.order_values.present?
+                  @records.sort_by { |record| hits.index { |hit| hit['_id'].to_s == record.id.to_s } }
+                else
+                  @records
+                end
               end if self
             end
 

elasticsearch-model/spec/elasticsearch/model/adapters/active_record_spec.rb

@@ -95,6 +95,7 @@ class DummyClassForActiveRecord; end
 
         before do
           records.instance_variable_set(:@records, records)
+          allow(records).to receive(:order_values).and_return([])
         end
 
         it 'reorders the records based on hits order' do
@@ -111,6 +112,7 @@ class DummyClassForActiveRecord; end
         before do
           records.instance_variable_set(:@records, records)
           expect(instance.records).to receive(:order).and_return(records)
+          allow(records).to receive(:order_values).and_return([])
         end
 
         it 'reorders the records based on hits order' do

elasticsearch-model/test/integration/active_record_basic_test.rb

@@ -231,6 +231,13 @@ def as_indexed_json(options = {})
           end
         end
 
+        should "allow ordering following any method chain in SQL" do
+          if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
+            response = Article.search query: { match: { title: { query: 'test' } } }
+            assert_equal 'Testing Coding', response.records.distinct.order(id: :desc).first.title
+          end
+        end
+
         should "allow dot access to response" do
           response = Article.search query: { match: { title: { query: 'test' } } },
                                     aggregations: {