Skip to content

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

DEV: add upcoming change for Solved badges (#41613)

David Battersby6e9b28f17c6b
diff --git a/plugins/discourse-solved/app/services/discourse_solved/enable_solved_badges_toggled.rb b/plugins/discourse-solved/app/services/discourse_solved/enable_solved_badges_toggled.rb
new file mode 100644
index 00000000000..b8ccaef461f
--- /dev/null
+++ b/plugins/discourse-solved/app/services/discourse_solved/enable_solved_badges_toggled.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# Reacts to the `enable_solved_badges` upcoming change being enabled or disabled
+# (manually or via auto-promotion). See the on(:upcoming_change_enabled) /
+# on(:upcoming_change_disabled) subscriptions in plugin.rb for the dispatch.
+#
+# Enabling turns on the four seeded Solved badges; disabling turns them back off.
+#
+# New sites are handled separately by the badge seed fixture
+# (db/fixtures/001_badges.rb): the promotion event does not fire on brand-new
+# sites (UpcomingChanges.should_notify_admins? is false there), so the seed is
+# what gives freshly provisioned sites their enabled-by-default badges.
+module DiscourseSolved
+ class EnableSolvedBadgesToggled < Service::ActionBase
+ BADGE_NAMES = ["Solved 1", "Solved 2", "Solved 3", "Solved 4"].freeze
+
+ option :enabled
+
+ def call
+ Badge.where(name: BADGE_NAMES).update_all(enabled:)
+ end
+ end
+end
diff --git a/plugins/discourse-solved/config/locales/server.en.yml b/plugins/discourse-solved/config/locales/server.en.yml
index 689ff994832..43788b6e3ef 100644
--- a/plugins/discourse-solved/config/locales/server.en.yml
+++ b/plugins/discourse-solved/config/locales/server.en.yml
@@ -47,6 +47,7 @@ en:
prioritize_solved_topics_in_search: "Prioritize solved topics in search results."
enable_support_category_type_setup: "Enables the Support category type option during category creation setup."
enable_solved_shared_issues: "Adds a “Me too” button to unsolved topics in support categories, letting members signal they’re experiencing the same issue and opt-in to notifications about the topic's solution."
+ enable_solved_badges: "Enables the Solved badges awarded to members when they provide solutions to others’ questions."
show_who_marked_solved: "Show who marked the topic as solved. This is indicated in the topic's first post, and the answer post in a tooltip."
keywords:
diff --git a/plugins/discourse-solved/config/settings.yml b/plugins/discourse-solved/config/settings.yml
index 35b0ac6e206..d375c23e682 100644
--- a/plugins/discourse-solved/config/settings.yml
+++ b/plugins/discourse-solved/config/settings.yml
@@ -78,6 +78,14 @@ discourse_solved:
status: "beta"
impact: "feature,all_members"
learn_more_url: "https://meta.discourse.org/t/-/402498"
+ enable_solved_badges:
+ default: false
+ hidden: true
+ client: true
+ upcoming_change:
+ status: "alpha"
+ impact: "site_setting_default,all_members"
+ learn_more_url: "https://meta.discourse.org/t/-/406386"
discourse_solved_admin_dashboard_seeded:
default: false
hidden: true
diff --git a/plugins/discourse-solved/db/fixtures/001_badges.rb b/plugins/discourse-solved/db/fixtures/001_badges.rb
index 3055ad0512c..a46b4f425b4 100644
--- a/plugins/discourse-solved/db/fixtures/001_badges.rb
+++ b/plugins/discourse-solved/db/fixtures/001_badges.rb
@@ -23,7 +23,7 @@ Badge.seed(:name) do |badge|
badge.query = first_solution_query
badge.listable = true
badge.target_posts = true
- badge.default_enabled = false
+ badge.default_enabled = true
badge.trigger = Badge::Trigger::PostRevision
badge.auto_revoke = true
badge.show_posts = true
@@ -58,7 +58,7 @@ end
badge.listable = true
badge.default_allow_title = true
badge.target_posts = false
- badge.default_enabled = false
+ badge.default_enabled = true
badge.trigger = Badge::Trigger::PostRevision
badge.auto_revoke = true
badge.show_posts = false
diff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rb
index 1ec67d0d79d..9b02914eba9 100644
--- a/plugins/discourse-solved/plugin.rb
+++ b/plugins/discourse-solved/plugin.rb
@@ -286,6 +286,18 @@ after_initialize do
scope.shared_issue_visible?(object.topic)
end
+ on(:upcoming_change_enabled) do |setting_name|
+ if setting_name == :enable_solved_badges
+ DiscourseSolved::EnableSolvedBadgesToggled.call(enabled: true)
+ end
+ end
+
+ on(:upcoming_change_disabled) do |setting_name|
+ if setting_name == :enable_solved_badges
+ DiscourseSolved::EnableSolvedBadgesToggled.call(enabled: false)
+ end
+ end
+
on(:post_destroyed) do |post|
DiscourseSolved::UnacceptAnswer.call(
params: {
diff --git a/plugins/discourse-solved/spec/integration/enable_solved_badges_spec.rb b/plugins/discourse-solved/spec/integration/enable_solved_badges_spec.rb
new file mode 100644
index 00000000000..aedfdb1fe4a
--- /dev/null
+++ b/plugins/discourse-solved/spec/integration/enable_solved_badges_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.describe "Enable Solved badges by default upcoming change" do
+ let(:badge_names) { ["Solved 1", "Solved 2", "Solved 3", "Solved 4"] }
+
+ def reseed_solved_badges
+ Badge.where(name: badge_names).delete_all
+ load Rails.root.join("plugins/discourse-solved/db/fixtures/001_badges.rb") # rubocop:disable Discourse/Plugins/UseRequireRelative
+ end
+
+ describe "seeding the Solved badges on a new site" do
+ it "enables the badges by default" do
+ reseed_solved_badges
+
+ expect(Badge.where(name: badge_names).pluck(:enabled)).to all(eq(true))
+ end
+ end
+end
diff --git a/plugins/discourse-solved/spec/services/discourse_solved/enable_solved_badges_toggled_spec.rb b/plugins/discourse-solved/spec/services/discourse_solved/enable_solved_badges_toggled_spec.rb
new file mode 100644
index 00000000000..5cb1102715f
--- /dev/null
+++ b/plugins/discourse-solved/spec/services/discourse_solved/enable_solved_badges_toggled_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RSpec.describe DiscourseSolved::EnableSolvedBadgesToggled do
+ let(:badge_names) { DiscourseSolved::EnableSolvedBadgesToggled::BADGE_NAMES }
+
+ def solved_badges
+ Badge.where(name: badge_names)
+ end
+
+ describe "enabling" do
+ before { solved_badges.update_all(enabled: false) }
+
+ it "enables all four Solved badges" do
+ described_class.call(enabled: true)
+
+ expect(solved_badges.where(enabled: true).count).to eq(4)
+ end
+ end
+
+ describe "disabling" do
+ before { solved_badges.update_all(enabled: true) }
+
+ it "disables all four Solved badges" do
+ described_class.call(enabled: false)
+
+ expect(solved_badges.where(enabled: false).count).to eq(4)
+ end
+ end
+end