Skip to content

Commit

Permalink
feat: enable context variable usage in segment queries (#712)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthv authored Jan 6, 2025
1 parent 1664250 commit 0851178
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
2 changes: 2 additions & 0 deletions app/services/forest_liana/resources_getter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ def apply_live_query_segment

begin
segment_query = @params[:segmentQuery].gsub(/\;\s*$/, '')
ScopeManager.inject_context_variables_on_query(segment_query, @user)

@records = @records.where(
"#{@resource.table_name}.#{@resource.primary_key} IN (SELECT id FROM (#{segment_query}) as ids)"
)
Expand Down
8 changes: 7 additions & 1 deletion app/services/forest_liana/scope_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,19 @@ def self.get_scope(collection_name, user, request_context_variables = nil)

def self.inject_context_variables(filter, user, request_context_variables = nil)
filter = JSON.parse(filter) if filter.is_a? String

retrieve = fetch_scopes(user['rendering_id'])
context_variables = Utils::ContextVariables.new(retrieve['team'], user, request_context_variables)

Utils::ContextVariablesInjector.inject_context_in_filter(filter, context_variables)
end

def self.inject_context_variables_on_query(query, user)
retrieve = fetch_scopes(user['rendering_id'])
context_variables = Utils::ContextVariables.new(retrieve['team'], user)

Utils::ContextVariablesInjector.inject_context_in_value(query, context_variables)
end

def self.invalidate_scope_cache(rendering_id)
Rails.cache.delete('forest.scopes.' + rendering_id.to_s)
end
Expand Down
26 changes: 26 additions & 0 deletions spec/services/forest_liana/scope_manager_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,32 @@ module ForestLiana
expect(filters_parser).to have_received(:apply_filters).once
end
end

describe '#inject_context_variables_on_query' do
let(:query) { "SELECT id FROM users WHERE email = '{{currentUser.email}}'" }
let(:filled_scope) {
JSON.generate(
{
'collections' => {
'User' => {}
},
'team' => {'id' => '1', 'name' => 'Operations'}
}
)
}
let(:api_call_response_success) { Net::HTTPOK.new({}, 200, filled_scope) }

before do
allow(ForestLiana::ForestApiRequester).to receive(:get).and_return(api_call_response_success)
allow(api_call_response_success).to receive(:body).and_return(filled_scope)
end

it 'should inject the context variables in the query' do
described_class.inject_context_variables_on_query(query, user)

expect(query).to eq "SELECT id FROM users WHERE email = 'jd@forestadmin.com'"
end
end
end
end
end

0 comments on commit 0851178

Please sign in to comment.