From ed880e4954803f9753cfafe0dd8106852245d10d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 15 Dec 2016 23:45:10 +0100
Subject: [PATCH] Rename ChatService into ChatSlashCommandsService

---
 app/models/project.rb                         |  1 -
 app/models/project_services/chat_service.rb   | 21 -------
 .../chat_slash_commands_service.rb            | 55 +++++++++++++++++++
 .../mattermost_slash_commands_service.rb      | 28 +---------
 .../slack_slash_commands_service.rb           | 36 +-----------
 5 files changed, 60 insertions(+), 81 deletions(-)
 delete mode 100644 app/models/project_services/chat_service.rb
 create mode 100644 app/models/project_services/chat_slash_commands_service.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index 7f3a4debfc6..9d8351399f9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -79,7 +79,6 @@ class Project < ActiveRecord::Base
 
   has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event'
   has_many :boards, before_add: :validate_board_limit, dependent: :destroy
-  has_many :chat_services
 
   # Project services
   has_one :campfire_service, dependent: :destroy
diff --git a/app/models/project_services/chat_service.rb b/app/models/project_services/chat_service.rb
deleted file mode 100644
index 574788462de..00000000000
--- a/app/models/project_services/chat_service.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Base class for Chat services
-# This class is not meant to be used directly, but only to inherit from.
-class ChatService < Service
-  default_value_for :category, 'chat'
-
-  has_many :chat_names, foreign_key: :service_id
-
-  def valid_token?(token)
-    self.respond_to?(:token) &&
-      self.token.present? &&
-      ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.token)
-  end
-
-  def supported_events
-    []
-  end
-
-  def trigger(params)
-    raise NotImplementedError
-  end
-end
diff --git a/app/models/project_services/chat_slash_commands_service.rb b/app/models/project_services/chat_slash_commands_service.rb
new file mode 100644
index 00000000000..b21a1730285
--- /dev/null
+++ b/app/models/project_services/chat_slash_commands_service.rb
@@ -0,0 +1,55 @@
+# Base class for Chat services
+# This class is not meant to be used directly, but only to inherrit from.
+class ChatSlashCommandsService < Service
+  default_value_for :category, 'chat'
+
+  prop_accessor :token
+
+  has_many :chat_names, foreign_key: :service_id
+
+  def valid_token?(token)
+    self.respond_to?(:token) &&
+      self.token.present? &&
+      ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.token)
+  end
+
+  def supported_events
+    []
+  end
+
+  def can_test?
+    false
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'token', placeholder: '' }
+    ]
+  end
+
+  def trigger(params)
+    return nil unless valid_token?(params[:token])
+
+    user = find_chat_user(params)
+    unless user
+      url = authorize_chat_name_url(params)
+      return presenter.authorize_chat_name(url)
+    end
+
+    Gitlab::ChatCommands::Command.new(presenter, project, user, params).execute
+  end
+
+  private
+
+  def find_chat_user(params)
+    ChatNames::FindUserService.new(self, params).execute
+  end
+
+  def authorize_chat_name_url(params)
+    ChatNames::AuthorizeUserService.new(self, params).execute
+  end
+
+  def presenter
+    throw NotImplementedError
+  end
+end
diff --git a/app/models/project_services/mattermost_slash_commands_service.rb b/app/models/project_services/mattermost_slash_commands_service.rb
index 33431f41dc2..4c1e27cafbb 100644
--- a/app/models/project_services/mattermost_slash_commands_service.rb
+++ b/app/models/project_services/mattermost_slash_commands_service.rb
@@ -19,31 +19,7 @@ class MattermostSlashCommandsService < ChatService
     'mattermost_slash_commands'
   end
 
-  def fields
-    [
-      { type: 'text', name: 'token', placeholder: '' }
-    ]
-  end
-
-  def trigger(params)
-    return nil unless valid_token?(params[:token])
-
-    user = find_chat_user(params)
-    unless user
-      url = authorize_chat_name_url(params)
-      return Mattermost::Presenter.authorize_chat_name(url)
-    end
-
-    Gitlab::ChatCommands::Command.new(project, user, params).execute
-  end
-
-  private
-
-  def find_chat_user(params)
-    ChatNames::FindUserService.new(self, params).execute
-  end
-
-  def authorize_chat_name_url(params)
-    ChatNames::AuthorizeUserService.new(self, params).execute
+  def presenter
+    Gitlab::ChatCommands::Presenters::Mattermost.new
   end
 end
diff --git a/app/models/project_services/slack_slash_commands_service.rb b/app/models/project_services/slack_slash_commands_service.rb
index 9c66f95eef9..978d48e8c18 100644
--- a/app/models/project_services/slack_slash_commands_service.rb
+++ b/app/models/project_services/slack_slash_commands_service.rb
@@ -1,12 +1,6 @@
-class SlackSlashCommandsService < ChatService
+class SlackSlashCommandsService < ChatSlashCommandsService
   include TriggersHelper
 
-  prop_accessor :token
-
-  def can_test?
-    false
-  end
-
   def title
     'Slack Slash Command'
   end
@@ -19,31 +13,7 @@ class SlackSlashCommandsService < ChatService
     'slack_slash_commands'
   end
 
-  def fields
-    [
-      { type: 'text', name: 'token', placeholder: '' }
-    ]
-  end
-
-  def trigger(params)
-    return nil unless valid_token?(params[:token])
-
-    user = find_chat_user(params)
-    unless user
-      url = authorize_chat_name_url(params)
-      return Gitlab::ChatCommands::Presenters::Access.new(url).authorize
-    end
-
-    Gitlab::ChatCommands::Command.new(project, user, params).execute
-  end
-
-  private
-
-  def find_chat_user(params)
-    ChatNames::FindUserService.new(self, params).execute
-  end
-
-  def authorize_chat_name_url(params)
-    ChatNames::AuthorizeUserService.new(self, params).execute
+  def presenter
+    Gitlab::ChatCommands::Presenters::Mattermost.new
   end
 end