Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ gem 'good_job', '~> 4.0'
gem 'rotp'

gem 'grpc', '~> 1.67'
gem 'tucana', '0.0.35'
gem 'tucana', '0.0.36'

gem 'code0-identities', '~> 0.0.1'

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ GEM
test-prof (1.4.4)
thor (1.4.0)
timeout (0.4.3)
tucana (0.0.35)
tucana (0.0.36)
grpc (~> 1.64)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -422,7 +422,7 @@ DEPENDENCIES
simplecov (~> 0.22.0)
simplecov-cobertura (~> 3.0)
test-prof (~> 1.0)
tucana (= 0.0.35)
tucana (= 0.0.36)
tzinfo-data

RUBY VERSION
Expand Down
15 changes: 14 additions & 1 deletion app/models/flow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,20 @@ def to_grpc
input_type_identifier: input_type&.identifier,
return_type_identifier: return_type&.identifier,
settings: flow_settings.map(&:to_grpc),
starting_node: starting_node.to_grpc
starting_node_id: starting_node.id,
node_functions: collect_node_functions
)
end

private

def collect_node_functions
current_node = starting_node
nodes = []
until current_node.nil?
nodes << current_node.to_grpc
current_node = current_node.next_node
end
nodes
end
end
2 changes: 1 addition & 1 deletion app/models/node_function.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def to_grpc
database_id: id,
runtime_function_id: runtime_function.runtime_name,
parameters: node_parameters.map(&:to_grpc),
next_node: next_node&.to_grpc
next_node_id: next_node&.id
)
end
end
107 changes: 62 additions & 45 deletions spec/models/flow_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,56 +17,73 @@

describe '#to_grpc' do
let(:flow) do
create(:flow,
flow_settings: [
create(:flow_setting,
flow_setting_id: 'example_key',
object: { some_key: 'some_value' })
],
starting_node: create(:node_function,
node_parameters: [
create(:node_parameter,
runtime_parameter: create(:runtime_parameter_definition,
data_type: create(:data_type_identifier,
generic_key: 'T')))
]))
create(
:flow,
flow_settings: [
create(
:flow_setting,
flow_setting_id: 'example_key',
object: { some_key: 'some_value' }
)
],
starting_node: create(
:node_function,
node_parameters: [
create(
:node_parameter,
runtime_parameter: create(
:runtime_parameter_definition,
data_type: create(
:data_type_identifier,
generic_key: 'T'
)
)
)
]
)
)
end

it 'matches the model' do
grpc_object = flow.to_grpc

expect(grpc_object.to_h).to eq({
flow_id: flow.id,
project_id: flow.project.id,
type: flow.flow_type.identifier,
starting_node: {
database_id: flow.starting_node.id,
runtime_function_id: flow.starting_node.runtime_function.runtime_name,
parameters: [
{
database_id: flow.starting_node.node_parameters.first.id,
runtime_parameter_id:
flow.starting_node.node_parameters.first.runtime_parameter.runtime_name,
value: {
literal_value: {
string_value: flow.starting_node.node_parameters.first.literal_value,
},
},
}
],
},
settings: [
database_id: flow.flow_settings.first.id,
flow_setting_id: flow.flow_settings.first.flow_setting_id,
object: {
fields: {
'some_key' => {
string_value: flow.flow_settings.first.object['some_key'],
},
},
}
],
})
expect(grpc_object.to_h).to eq(
{
flow_id: flow.id,
project_id: flow.project.id,
type: flow.flow_type.identifier,
node_functions: [
{
database_id: flow.starting_node.id,
runtime_function_id: flow.starting_node.runtime_function.runtime_name,
parameters: [
{
database_id: flow.starting_node.node_parameters.first.id,
runtime_parameter_id:
flow.starting_node.node_parameters.first.runtime_parameter.runtime_name,
value: {
literal_value: {
string_value: flow.starting_node.node_parameters.first.literal_value,
},
},
}
],
}
],
starting_node_id: flow.starting_node.id,
settings: [
database_id: flow.flow_settings.first.id,
flow_setting_id: flow.flow_settings.first.flow_setting_id,
object: {
fields: {
'some_key' => {
string_value: flow.flow_settings.first.object['some_key'],
},
},
}
],
}
)
end
end
end