Skip to content

Commit 9efe9d5

Browse files
committed
Fix grpc rule logic
1 parent b490a1c commit 9efe9d5

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

app/services/runtimes/data_types/update_service.rb

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,16 @@ def update_rules(rules, data_type)
159159
db_rules = data_type.rules.first(rules.length)
160160
rules.each_with_index do |rule, index|
161161
config = rule.rule_config.to_h.transform_values do |value|
162-
case value
163-
when Tucana::Shared::DataTypeIdentifier
164-
if value.data_type_identifier.present?
165-
value.data_type_identifier
166-
elsif value.generic_key.present?
167-
{ generic_key: value.generic_key }
168-
else
169-
{ generic_type: value.generic_type }
170-
end
171-
else
172-
value
173-
end
162+
next value unless value.is_a?(Hash)
163+
164+
data_type_identifier = value[:data_type_identifier]
165+
generic_key = value[:generic_key]
166+
167+
next value if data_type_identifier.nil? || generic_key.nil? # return the old thing if neither is present
168+
next data_type_identifier unless data_type_identifier.empty? # return data_type_identifier if it's present
169+
next { generic_key: generic_key } if generic_key.present? # return generic_key if it's present
170+
171+
next { generic_type: value[:generic_type] }
174172
end
175173

176174
db_rules[index] ||= DataTypeRule.new

app/services/runtimes/flow_types/update_service.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ def execute
3636

3737
UpdateRuntimeCompatibilityJob.perform_later({ runtime_id: current_runtime.id })
3838

39+
logger.info(message: 'Updated flow types for runtime', runtime_id: current_runtime.id)
40+
3941
ServiceResponse.success(message: 'Updated data types', payload: flow_types)
4042
end
4143
end

0 commit comments

Comments
 (0)