Skip to content

Commit 252d87f

Browse files
committed
fix: switch _doc to _source for GET
1 parent ff069c0 commit 252d87f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

lib/elastic_search_framework/repository.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def set(index:, entity:, type: 'default', op_type: 'index', routing_key: nil)
2828
end
2929

3030
def get(index:, id:, type: 'default', routing_key: nil)
31-
uri_string = "#{host}/#{index.full_name}/_doc/#{id}"
31+
uri_string = "#{host}/#{index.full_name}/_source/#{id}"
3232
uri_string += "?routing=#{routing_key}" if routing_key
3333

3434
uri = URI(uri_string)
@@ -42,9 +42,9 @@ def get(index:, id:, type: 'default', routing_key: nil)
4242
if valid_response?(response.code)
4343
result = JSON.load(response.body)
4444
hash_helper.indifferent!(result)
45-
return result
45+
result
4646
elsif Integer(response.code) == 404
47-
return nil
47+
nil
4848
else
4949
raise ElasticSearchFramework::Exceptions::IndexError.new(
5050
"An error occurred getting an index document. Response: #{response.body}"

spec/elastic_search_framework/repository_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
subject.set(index: ExampleIndex, entity: item2)
7272
subject.set(index: ExampleIndex, entity: item5)
7373
index_item1 = subject.get(index: ExampleIndex, id: item1.id)
74-
expect(index_item1[:_source][:id]).to eq item1.id
75-
expect(index_item1[:_source][:name]).to eq item1.name
76-
expect(index_item1[:_source][:timestamp]).to eq item1.timestamp
77-
expect(index_item1[:_source][:number]).to eq item1.number
74+
expect(index_item1[:id]).to eq item1.id
75+
expect(index_item1[:name]).to eq item1.name
76+
expect(index_item1[:timestamp]).to eq item1.timestamp
77+
expect(index_item1[:number]).to eq item1.number
7878
index_item2 = subject.get(index: ExampleIndex, id: item2.id)
79-
expect(index_item2[:_source][:id]).to eq item2.id
80-
expect(index_item2[:_source][:name]).to eq item2.name
81-
expect(index_item2[:_source][:timestamp]).to eq item2.timestamp
82-
expect(index_item2[:_source][:number]).to eq item2.number
79+
expect(index_item2[:id]).to eq item2.id
80+
expect(index_item2[:name]).to eq item2.name
81+
expect(index_item2[:timestamp]).to eq item2.timestamp
82+
expect(index_item2[:number]).to eq item2.number
8383
subject.drop(index: ExampleIndex, id: item1.id)
8484
expect(subject.get(index: ExampleIndex, id: item1.id)).to be_nil
8585
end
@@ -92,10 +92,10 @@
9292
subject.set(index: ExampleIndex, entity: item1)
9393
subject.set(index: ExampleIndex, entity: item1.tap { |i| i.timestamp += 100 }, op_type: 'create')
9494
index_item1 = subject.get(index: ExampleIndex, id: item1.id)
95-
expect(index_item1[:_source][:id]).to eq item1.id
96-
expect(index_item1[:_source][:name]).to eq item1.name
97-
expect(index_item1[:_source][:timestamp]).to eq original_timestamp
98-
expect(index_item1[:_source][:number]).to eq item1.number
95+
expect(index_item1[:id]).to eq item1.id
96+
expect(index_item1[:name]).to eq item1.name
97+
expect(index_item1[:timestamp]).to eq original_timestamp
98+
expect(index_item1[:number]).to eq item1.number
9999
end
100100
end
101101

0 commit comments

Comments
 (0)