Skip to content

Commit 0851178

Browse files
authored
feat: enable context variable usage in segment queries (#712)
1 parent 1664250 commit 0851178

File tree

3 files changed

+35
-1
lines changed

3 files changed

+35
-1
lines changed

app/services/forest_liana/resources_getter.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ def apply_live_query_segment
132132

133133
begin
134134
segment_query = @params[:segmentQuery].gsub(/\;\s*$/, '')
135+
ScopeManager.inject_context_variables_on_query(segment_query, @user)
136+
135137
@records = @records.where(
136138
"#{@resource.table_name}.#{@resource.primary_key} IN (SELECT id FROM (#{segment_query}) as ids)"
137139
)

app/services/forest_liana/scope_manager.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,19 @@ def self.get_scope(collection_name, user, request_context_variables = nil)
3737

3838
def self.inject_context_variables(filter, user, request_context_variables = nil)
3939
filter = JSON.parse(filter) if filter.is_a? String
40-
4140
retrieve = fetch_scopes(user['rendering_id'])
4241
context_variables = Utils::ContextVariables.new(retrieve['team'], user, request_context_variables)
4342

4443
Utils::ContextVariablesInjector.inject_context_in_filter(filter, context_variables)
4544
end
4645

46+
def self.inject_context_variables_on_query(query, user)
47+
retrieve = fetch_scopes(user['rendering_id'])
48+
context_variables = Utils::ContextVariables.new(retrieve['team'], user)
49+
50+
Utils::ContextVariablesInjector.inject_context_in_value(query, context_variables)
51+
end
52+
4753
def self.invalidate_scope_cache(rendering_id)
4854
Rails.cache.delete('forest.scopes.' + rendering_id.to_s)
4955
end

spec/services/forest_liana/scope_manager_spec.rb

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,32 @@ module ForestLiana
326326
expect(filters_parser).to have_received(:apply_filters).once
327327
end
328328
end
329+
330+
describe '#inject_context_variables_on_query' do
331+
let(:query) { "SELECT id FROM users WHERE email = '{{currentUser.email}}'" }
332+
let(:filled_scope) {
333+
JSON.generate(
334+
{
335+
'collections' => {
336+
'User' => {}
337+
},
338+
'team' => {'id' => '1', 'name' => 'Operations'}
339+
}
340+
)
341+
}
342+
let(:api_call_response_success) { Net::HTTPOK.new({}, 200, filled_scope) }
343+
344+
before do
345+
allow(ForestLiana::ForestApiRequester).to receive(:get).and_return(api_call_response_success)
346+
allow(api_call_response_success).to receive(:body).and_return(filled_scope)
347+
end
348+
349+
it 'should inject the context variables in the query' do
350+
described_class.inject_context_variables_on_query(query, user)
351+
352+
expect(query).to eq "SELECT id FROM users WHERE email = 'jd@forestadmin.com'"
353+
end
354+
end
329355
end
330356
end
331357
end

0 commit comments

Comments
 (0)