Skip to content

A platform for community discussion. Free, open, simple.

DEV: Simplify post button post number resolution

Régis Hanol9a3d0938dbab
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_button/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_button/v1.rb
index 2c9c86a56f8..b606375dae5 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_button/v1.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_button/v1.rb
@@ -148,23 +148,17 @@ module DiscourseWorkflows
group_ids.present? && user.in_any_groups?(group_ids)
end
- def self.normalized_post_number(parameters)
- value = parameters["post_number"].to_s
- value.to_i if value.match?(/\A[1-9]\d*\z/)
- end
-
def self.resolved_post_number(parameters)
- value = parameters["post_number"]
- return if value.to_s.strip.empty?
+ return unless value = parameters["post_number"].to_s.strip.presence
- normalized_post_number(parameters) || INVALID_POST_NUMBER
+ value.match?(/\A[1-9]\d*\z/) ? value.to_i : INVALID_POST_NUMBER
end
def self.matches_post_number?(post, parameters)
post_number = resolved_post_number(parameters)
return true if post_number.nil?
- post.present? && post.post_number == post_number
+ post.post_number == post_number
end
def self.resolved_position(parameters)
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb
index bc6700c0d9a..d650e52001c 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb
@@ -54,44 +54,17 @@ RSpec.describe DiscourseWorkflows::Nodes::PostButton::V1 do
end
end
- describe ".normalized_post_number" do
- it "normalizes positive integer values" do
- expect(described_class.normalized_post_number("post_number" => post.post_number)).to eq(
- post.post_number,
- )
- expect(described_class.normalized_post_number("post_number" => post.post_number.to_s)).to eq(
- post.post_number,
- )
+ describe ".resolved_post_number" do
+ it "returns nil when the post number is missing or blank" do
+ [nil, "", " "].each do |post_number|
+ expect(described_class.resolved_post_number("post_number" => post_number)).to be_nil
+ end
end
- it "returns nil for missing, blank, malformed, and nonpositive values" do
- [
- {},
- { "post_number" => "" },
- { "post_number" => "invalid" },
- { "post_number" => 0 },
- { "post_number" => -1 },
- ].each { |parameters| expect(described_class.normalized_post_number(parameters)).to be_nil }
- end
- end
-
- describe ".resolved_post_number" do
- it "returns nil when the parameter is missing or blank" do
- [
- {},
- { "post_number" => nil },
- { "post_number" => "" },
- { "post_number" => " " },
- ].each { |parameters| expect(described_class.resolved_post_number(parameters)).to be_nil }
- end
-
- it "returns an integer for numeric values" do
- expect(described_class.resolved_post_number("post_number" => post.post_number)).to eq(
- post.post_number,
- )
- expect(described_class.resolved_post_number("post_number" => post.post_number.to_s)).to eq(
- post.post_number,
- )
+ it "returns an integer for positive numeric values" do
+ [5, "5", " 5 "].each do |post_number|
+ expect(described_class.resolved_post_number("post_number" => post_number)).to eq(5)
+ end
end
it "returns the invalid sentinel for malformed and nonpositive values" do