Skip to content

Commit bd84b0d

Browse files
author
Adam Jazairi
authored
Merge pull request #665 from MITLibraries/timx-185-fix-retrieve-index
Fix default index for V2 retrieve queries
2 parents 9fca1cc + 9b89ca9 commit bd84b0d

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

app/models/retrieve.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def fetch(id, client, index = nil)
1616
end
1717

1818
def default_index
19-
ENV.fetch('ELASTICSEARCH_INDEX', nil)
19+
Flipflop.v2? ? ENV.fetch('OPENSEARCH_INDEX', nil) : ENV.fetch('ELASTICSEARCH_INDEX', nil)
2020
end
2121

2222
def to_filter(id)

test/models/retrieve_test.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
require 'test_helper'
2+
3+
class RetrieveTest < ActiveSupport::TestCase
4+
def setup
5+
@test_strategy = Flipflop::FeatureSet.current.test!
6+
end
7+
8+
test 'graphlv1 uses correct index for retrieve queries' do
9+
@test_strategy.switch!(:v2, false)
10+
assert_equal ENV.fetch('ELASTICSEARCH_INDEX'), Retrieve.new.default_index
11+
end
12+
13+
test 'graphqlv2 uses correct index for retrieve queries' do
14+
@test_strategy.switch!(:v2, true)
15+
assert_equal ENV.fetch('OPENSEARCH_INDEX'), Retrieve.new.default_index
16+
end
17+
end

0 commit comments

Comments
 (0)