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

[#64348] Refactor #formula_references_id?

Tobias Dillmannca37dc4f40c3
diff --git a/app/models/custom_field/calculated_value.rb b/app/models/custom_field/calculated_value.rb
index dfd38b115fc..63042683608 100644
--- a/app/models/custom_field/calculated_value.rb
+++ b/app/models/custom_field/calculated_value.rb
@@ -78,7 +78,7 @@ module CustomField::CalculatedValue
.visible
visible_cfs.reject do |custom_field|
- formula_references_id?(custom_field, id)
+ custom_field.formula_references_id?(id)
end
end
@@ -97,6 +97,22 @@ module CustomField::CalculatedValue
end
end
+ def formula_references_id?(original_id, visited = Set.new)
+ return true unless visited.add?(id)
+
+ if field_format_calculated_value?
+ referenced_custom_fields = formula_referenced_custom_field_ids
+
+ return true if referenced_custom_fields.include?(original_id)
+
+ ProjectCustomField.where(id: referenced_custom_fields).any? do |referenced_field|
+ referenced_field.formula_references_id?(original_id, visited)
+ end
+ else
+ false
+ end
+ end
+
private
def calculator
@@ -139,21 +155,5 @@ module CustomField::CalculatedValue
def formula_str_without_patterns
formula_string.gsub(/\{\{(cf_\d+)}}/, '\1')
end
-
- def formula_references_id?(custom_field, original_id, visited = Set.new)
- return true unless visited.add?(custom_field.id)
-
- if custom_field.field_format_calculated_value?
- referenced_custom_fields = custom_field.formula_referenced_custom_field_ids
-
- return true if referenced_custom_fields.include?(original_id)
-
- ProjectCustomField.where(id: referenced_custom_fields).any? do |referenced_field|
- formula_references_id?(referenced_field, original_id, visited)
- end
- else
- false
- end
- end
end
end
diff --git a/spec/models/custom_field/calculated_value_spec.rb b/spec/models/custom_field/calculated_value_spec.rb
index 286a4fffae2..10b16905dae 100644
--- a/spec/models/custom_field/calculated_value_spec.rb
+++ b/spec/models/custom_field/calculated_value_spec.rb
@@ -185,15 +185,15 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
context "when checking a non-calculated value custom field" do
it "returns false for integer custom field" do
- expect(subject.send(:formula_references_id?, int_field, subject.id)).to be false
+ expect(int_field.formula_references_id?(subject.id)).to be false
end
it "returns false for float custom field" do
- expect(subject.send(:formula_references_id?, float_field, subject.id)).to be false
+ expect(float_field.formula_references_id?(subject.id)).to be false
end
it "returns false for text custom field" do
- expect(subject.send(:formula_references_id?, text_field, subject.id)).to be false
+ expect(text_field.formula_references_id?(subject.id)).to be false
end
end
@@ -203,7 +203,7 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
end
it "returns false" do
- expect(subject.send(:formula_references_id?, simple_calculated_field, subject.id)).to be false
+ expect(simple_calculated_field.formula_references_id?(subject.id)).to be false
end
end
@@ -221,7 +221,7 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
end
it "returns true when field references itself" do
- circular = self_referencing_field.send(:formula_references_id?, self_referencing_field, self_referencing_field.id)
+ circular = self_referencing_field.formula_references_id?(self_referencing_field.id)
expect(circular).to be true
end
end
@@ -257,12 +257,12 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
end
it "returns true when there is an indirect circular reference" do
- expect(field_a.send(:formula_references_id?, field_a, field_a.id)).to be true
+ expect(field_a.formula_references_id?(field_a.id)).to be true
end
it "returns true when checking from any field in the circular chain" do
- expect(field_b.send(:formula_references_id?, field_b, field_b.id)).to be true
- expect(field_c.send(:formula_references_id?, field_c, field_c.id)).to be true
+ expect(field_b.formula_references_id?(field_b.id)).to be true
+ expect(field_c.formula_references_id?(field_c.id)).to be true
end
end
@@ -287,9 +287,9 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
end
it "returns false when there is no circular reference" do
- expect(field_x.send(:formula_references_id?, field_x, field_x.id)).to be false
- expect(field_y.send(:formula_references_id?, field_y, field_y.id)).to be false
- expect(field_z.send(:formula_references_id?, field_z, field_z.id)).to be false
+ expect(field_x.formula_references_id?(field_x.id)).to be false
+ expect(field_y.formula_references_id?(field_y.id)).to be false
+ expect(field_z.formula_references_id?(field_z.id)).to be false
end
end
@@ -308,12 +308,12 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
it "returns true when a node has already been visited" do
visited = Set.new([field1.id])
- expect(field2.send(:formula_references_id?, field1, field2.id, visited)).to be true
+ expect(field1.formula_references_id?(field2.id, visited)).to be true
end
it "returns false when checking a new node with empty visited set" do
visited = Set.new
- expect(field2.send(:formula_references_id?, field1, field2.id, visited)).to be false
+ expect(field1.formula_references_id?(field2.id, visited)).to be false
end
end
@@ -330,7 +330,7 @@ RSpec.describe CustomField::CalculatedValue, with_flag: { calculated_value_proje
end
it "returns false when referenced custom field does not exist" do
- circular = field_with_invalid_ref.send(:formula_references_id?, field_with_invalid_ref, field_with_invalid_ref.id)
+ circular = field_with_invalid_ref.formula_references_id?(field_with_invalid_ref.id)
expect(circular).to be false
end
end