Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#66093] ErrorHandler: rework argument list for `.handle_calculation_errors!`

Tobias Dillmann9ab4b47ea2b7
diff --git a/app/models/acts_as_customizable/calculated_value.rb b/app/models/acts_as_customizable/calculated_value.rb
index c3cea1e893d..4bd233a7252 100644
--- a/app/models/acts_as_customizable/calculated_value.rb
+++ b/app/models/acts_as_customizable/calculated_value.rb
@@ -117,10 +117,11 @@ module ActsAsCustomizable::CalculatedValue
enabled_calculated_fields = calculated_fields.filter { it.id.in?(enabled_ids) }
CalculatedValues::ErrorHandler.handle_calculation_errors(
- self,
- { values: result, errors: errors },
- given_cfs,
- enabled_calculated_fields
+ customized: self,
+ calculation_errors: errors,
+ calculation_values: result,
+ given_values: given_cfs,
+ calculated_fields: enabled_calculated_fields
)
end
diff --git a/app/models/calculated_values/error_handler.rb b/app/models/calculated_values/error_handler.rb
index 93f45658c06..1b84c5fe59e 100644
--- a/app/models/calculated_values/error_handler.rb
+++ b/app/models/calculated_values/error_handler.rb
@@ -49,13 +49,14 @@ module CalculatedValues
end
end
- def self.handle_calculation_errors(customized, calculation_result, given_values, calculated_fields)
- new(customized, calculation_result, given_values, calculated_fields).handle_errors
+ def self.handle_calculation_errors(customized:, calculation_errors:, calculation_values:, given_values:, calculated_fields:)
+ new(customized, calculation_errors, calculation_values, given_values, calculated_fields).handle_errors
end
- def initialize(customized, calculation_result, given_values, calculated_fields)
+ def initialize(customized, calculation_errors, calculation_values, given_values, calculated_fields)
@customized = customized
- @calculation_result = calculation_result
+ @calculation_errors = calculation_errors
+ @calculation_values = calculation_values
@given_values = given_values
@calculated_fields = calculated_fields
end
@@ -69,14 +70,14 @@ module CalculatedValues
private
- attr_reader :customized, :calculation_result, :given_values, :calculated_fields
+ attr_reader :customized, :calculation_errors, :calculation_values, :given_values, :calculated_fields
def should_create_errors?
customized.is_a?(Project)
end
def build_error_contexts
- calculation_result[:errors].filter_map do |cf_id, error|
+ calculation_errors.filter_map do |cf_id, error|
build_error_context(cf_id, error)
end
end
@@ -117,7 +118,7 @@ module CalculatedValues
end
def find_indirect_missing_values(calculated_field)
- cf_ids_with_results = calculation_result[:values].filter_map { |cf_id, v| to_id(cf_id) unless v.nil? }
+ cf_ids_with_results = calculation_values.filter_map { |cf_id, v| to_id(cf_id) unless v.nil? }
cf_ids_in_formula_without_result = calculated_field.formula_referenced_custom_field_ids - cf_ids_with_results
cf_ids_in_formula_without_result.filter do |ref_id|