FEATURE: Prevents assign notification & change status on solved

about.json

@@ -0,0 +1,7 @@
+{
+  "tests": {
+    "requiredPlugins": [
+     "https://github.com/discourse/discourse-assign"
+    ]
+  }
+}

app/lib/plugin_initializer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module DiscourseSolved
+  class PluginInitializer
+    attr_reader :plugin
+
+    def initialize(plugin)
+      @plugin = plugin
+    end
+
+    def apply_plugin_api
+      # this method should be overridden by subclasses
+      raise NotImplementedError
+    end
+  end
+
+  class AssignsReminderForTopicsQuery < PluginInitializer
+    def apply_plugin_api
+      plugin.register_modifier(:assigns_reminder_assigned_topics_query) do |query|
+        next query if !SiteSetting.ignore_solved_topics_in_assigned_reminder
+        query.where.not(
+          id:
+            TopicCustomField.where(
+              name: ::DiscourseSolved::ACCEPTED_ANSWER_POST_ID_CUSTOM_FIELD,
+            ).pluck(:topic_id),
+        )
+      end
+    end
+  end
+end

config/locales/server.en.yml

@@ -11,6 +11,8 @@ en:
     solved_topics_auto_close_hours: "Auto close topic (n) hours after the last reply once the topic has been marked as solved. Set to 0 to disable auto closing."
     show_filter_by_solved_status: "Show a dropdown to filter a topic list by solved status."
     notify_on_staff_accept_solved: "Send notification to the topic creator when a post is marked as solution by a staff."
+    ignore_solved_topics_in_assigned_reminder: "Prevent assigned reminder from including solved topics. only relevant when discourse-assign."
+    assignment_status_on_solve: "When a topic is solved update all assignments to this status"
     disable_solved_education_message: "Disable education message for solved topics."
     accept_solutions_topic_author: "Allow the topic author to accept a solution."
     solved_add_schema_markup: "Add QAPage schema markup to HTML."

config/settings.yml

@@ -32,6 +32,11 @@ discourse_solved:
     client: true
   notify_on_staff_accept_solved:
     default: false
+  ignore_solved_topics_in_assigned_reminder:
+    default: false
+  assignment_status_on_solve:
+    type: string
+    default: ""
   disable_solved_education_message:
     default: false
   accept_solutions_topic_author:

plugin.rb

@@ -47,6 +47,8 @@ class Engine < ::Rails::Engine
   require_relative "app/lib/web_hook_extension"
   require_relative "app/serializers/concerns/topic_answer_mixin"
 
+  require_relative "app/lib/plugin_initializer"
+  DiscourseSolved::AssignsReminderForTopicsQuery.new(self).apply_plugin_api
   module ::DiscourseSolved
     def self.accept_answer!(post, acting_user, topic: nil)
       topic ||= post.topic
@@ -622,4 +624,14 @@ def self.skip_db?
       end
     end
   end
+
+  if defined?(DiscourseAssign)
+    on(:accepted_solution) do |post|
+      next if SiteSetting.assignment_status_on_solve.blank?
+      Assigner.new(post.topic, post.acting_user).assign(
+        post.acting_user,
+        status: SiteSetting.assignment_status_on_solve,
+      )
+    end
+  end
 end

spec/integration/solved_spec.rb

@@ -366,4 +366,61 @@
       expect(response.status).to eq(200)
     end
   end
+
+  context "with discourse-assign installed", if: defined?(DiscourseAssign) do
+    let(:admin) { Fabricate(:admin) }
+    fab!(:group)
+
+    before do
+      SiteSetting.solved_enabled = true
+      SiteSetting.assign_enabled = true
+      SiteSetting.enable_assign_status = true
+      SiteSetting.assign_allowed_on_groups = "#{group.id}"
+      SiteSetting.assigns_public = true
+      SiteSetting.assignment_status_on_solve = "Done"
+
+      group.add(p1.acting_user)
+      group.add(user)
+
+      sign_in(user)
+    end
+
+    it "update all assignments to this status when a post is accepted" do
+      assigner = Assigner.new(p1.topic, user)
+      result = assigner.assign(user)
+      expect(result[:success]).to eq(true)
+
+      expect(p1.topic.assignment.status).to eq("New")
+      DiscourseSolved.accept_answer!(p1, user)
+
+      expect(p1.reload.custom_fields["is_accepted_answer"]).to eq("true")
+      expect(p1.topic.assignment.reload.status).to eq("Done")
+    end
+  end
+
+  context "with using assigns_reminder_assigned_topics_query modifier" do
+    class DummyClass
+      def test
+        DiscoursePluginRegistry.apply_modifier(:assigns_reminder_assigned_topics_query, Topic.all)
+      end
+    end
+
+    before { SiteSetting.ignore_solved_topics_in_assigned_reminder = true }
+
+    it "should not include solved topics in the query" do
+      topic = Fabricate(:topic)
+      topic2 = Fabricate(:topic)
+      topic3 = Fabricate(:topic)
+      post = Fabricate(:post, topic: topic)
+
+      DiscourseSolved.accept_answer!(post, Discourse.system_user)
+
+      topics = DummyClass.new.test.to_a
+
+      expect(topics).not_to include(topic)
+
+      expect(topics).to include(topic2)
+      expect(topics).to include(topic3)
+    end
+  end
 end