Address already-closed issuesce-slack-close-command

3 files changed, 25 insertions, 8 deletions

diff --git a/lib/gitlab/slash_commands/issue_close.rb b/lib/gitlab/slash_commands/issue_close.rb
index d28429018fc..5fcc86e91c4 100644
--- a/lib/gitlab/slash_commands/issue_close.rb
+++ b/lib/gitlab/slash_commands/issue_close.rb
@@ -18,13 +18,12 @@ module Gitlab
       def execute(match)
         issue = find_by_iid(match[:iid])
 
-        if issue
-          close_issue(issue: issue)
+        return not_found unless issue
+        return presenter(issue).already_closed if issue.closed?
 
-          present(issue)
-        else
-          Gitlab::SlashCommands::Presenters::Access.new.not_found
-        end
+        close_issue(issue: issue)
+
+        presenter(issue).present
       end
 
       private
@@ -33,8 +32,12 @@ module Gitlab
         Issues::CloseService.new(project, current_user).execute(issue)
       end
 
-      def present(issue)
-        Gitlab::SlashCommands::Presenters::IssueClose.new(issue).present
+      def presenter(issue)
+        Gitlab::SlashCommands::Presenters::IssueClose.new(issue)
+      end
+
+      def not_found
+        Gitlab::SlashCommands::Presenters::Access.new.not_found
       end
     end
   end
diff --git a/lib/gitlab/slash_commands/presenters/issue_close.rb b/lib/gitlab/slash_commands/presenters/issue_close.rb
index c817103a167..b3f24f4296a 100644
--- a/lib/gitlab/slash_commands/presenters/issue_close.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_close.rb
@@ -14,6 +14,10 @@ module Gitlab
           end
         end
 
+        def already_closed
+          ephemeral_response(text: "Issue #{@resource.to_reference} is already closed.")
+        end
+
         private
 
         def close_issue
diff --git a/spec/lib/gitlab/slash_commands/issue_close_spec.rb b/spec/lib/gitlab/slash_commands/issue_close_spec.rb
index 6e21a7cbc19..c0760ce0ba6 100644
--- a/spec/lib/gitlab/slash_commands/issue_close_spec.rb
+++ b/spec/lib/gitlab/slash_commands/issue_close_spec.rb
@@ -52,6 +52,16 @@ describe Gitlab::SlashCommands::IssueClose do
         expect(subject[:text]).to match("not found")
       end
     end
+
+    context 'when the issue is already closed' do
+      let(:issue) { create(:issue, :closed, project: project) }
+
+      it 'shows the issue' do
+        expect(subject[:response_type]).to be(:ephemeral)
+        expect(issue.reload).to be_closed
+        expect(subject[:text]).to match("already closed")
+      end
+    end
   end
 
   describe '.match' do