Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'

Move external issue tracker away from yml config

See merge request !1442

6 files changed, 187 insertions, 7 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 97f23227484..12751bb77e6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -74,7 +74,12 @@ class Project < ActiveRecord::Base
   has_one :bamboo_service, dependent: :destroy
   has_one :teamcity_service, dependent: :destroy
   has_one :pushover_service, dependent: :destroy
-  has_one :forked_project_link, dependent: :destroy, foreign_key: 'forked_to_project_id'
+  has_one :jira_service, dependent: :destroy
+  has_one :redmine_service, dependent: :destroy
+  has_one :custom_issue_tracker_service, dependent: :destroy
+
+  has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
+
   has_one :forked_from_project, through: :forked_project_link
   # Merge Requests for target project should be removed with it
   has_many :merge_requests,     dependent: :destroy, foreign_key: 'target_project_id'
@@ -144,7 +149,7 @@ class Project < ActiveRecord::Base
   scope :public_and_internal_only, -> { where(visibility_level: Project.public_and_internal_levels) }
   scope :non_archived, -> { where(archived: false) }
 
-  enumerize :issues_tracker, in: (Gitlab.config.issues_tracker.keys).append(:gitlab), default: :gitlab
+  enumerize :issues_tracker, in: (Service.issue_tracker_service_list).append(:gitlab), default: :gitlab
 
   state_machine :import_status, initial: :none do
     event :import_start do
@@ -305,19 +310,34 @@ class Project < ActiveRecord::Base
   end
 
   def issue_exists?(issue_id)
-    if used_default_issues_tracker?
+    if default_issues_tracker?
       self.issues.where(iid: issue_id).first.present?
     else
       true
     end
   end
 
-  def used_default_issues_tracker?
-    self.issues_tracker == Project.issues_tracker.default_value
+  def default_issues_tracker?
+    if external_issue_tracker
+      false
+    else
+      unless self.issues_tracker == Project.issues_tracker.default_value
+        self.update_attributes(issues_tracker: Project.issues_tracker.default_value)
+      end
+      true
+    end
+  end
+
+  def external_issues_trackers
+    services.select { |service| service.issue_tracker? }
+  end
+
+  def external_issue_tracker
+    @external_issues_tracker ||= external_issues_trackers.select(&:activated?).first
   end
 
   def can_have_issues_tracker_id?
-    self.issues_enabled && !self.used_default_issues_tracker?
+    self.issues_enabled && !self.default_issues_tracker?
   end
 
   def build_missing_services
@@ -332,7 +352,7 @@ class Project < ActiveRecord::Base
 
   def available_services_names
     %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla
-       emails_on_push gemnasium slack pushover buildbox bamboo teamcity)
+       emails_on_push gemnasium slack pushover buildbox bamboo teamcity jira redmine custom_issue_tracker)
   end
 
   def gitlab_ci?
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
new file mode 100644
index 00000000000..2476b62da89
--- /dev/null
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -0,0 +1,38 @@
+class CustomIssueTrackerService < IssueTrackerService
+
+  prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
+
+  def title
+    if self.properties && self.properties['title'].present?
+      self.properties['title']
+    else
+      'Custom Issue Tracker'
+    end
+  end
+
+  def description
+    if self.properties && self.properties['description'].present?
+      self.properties['description']
+    else
+      'Custom issue tracker'
+    end
+  end
+
+  def to_param
+    'custom_issue_tracker'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'title', placeholder: title },
+      { type: 'text', name: 'description', placeholder: description },
+      { type: 'text', name: 'project_url', placeholder: 'Project url' },
+      { type: 'text', name: 'issues_url', placeholder: 'Issue url'},
+      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url'}
+    ]
+  end
+
+  def initialize_properties
+    self.properties = {} if properties.nil?
+  end
+end
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
new file mode 100644
index 00000000000..fc7b2fe5acd
--- /dev/null
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -0,0 +1,66 @@
+class IssueTrackerService < Service
+
+  validates :project_url, :issues_url, :new_issue_url, presence: true, if: :activated?
+
+  def category
+    :issue_tracker
+  end
+
+  def project_url
+    # implement inside child
+  end
+
+  def issues_url
+    # implement inside child
+  end
+
+  def new_issue_url
+    # implement inside child
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'description', placeholder: description },
+      { type: 'text', name: 'project_url', placeholder: 'Project url' },
+      { type: 'text', name: 'issues_url', placeholder: 'Issue url'},
+      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url'}
+    ]
+  end
+
+  def initialize_properties
+    if properties.nil?
+      if enabled_in_gitlab_config
+        self.properties = {
+          title: issues_tracker['title'],
+          project_url: set_project_url,
+          issues_url: issues_tracker['issues_url'],
+          new_issue_url: issues_tracker['new_issue_url']
+        }
+      else
+        self.properties = {}
+      end
+    end
+  end
+
+  private
+
+  def enabled_in_gitlab_config
+    Gitlab.config.issues_tracker &&
+    Gitlab.config.issues_tracker.values.any? &&
+    issues_tracker
+  end
+
+  def issues_tracker
+    Gitlab.config.issues_tracker[to_param]
+  end
+
+  def set_project_url
+    id = self.project.issues_tracker_id
+
+    if id
+      issues_tracker['project_url'].gsub(":issues_tracker_id", id)
+    else
+      issues_tracker['project_url']
+    end
+  end
+end
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
new file mode 100644
index 00000000000..b0d668948d0
--- /dev/null
+++ b/app/models/project_services/jira_service.rb
@@ -0,0 +1,24 @@
+class JiraService < IssueTrackerService
+
+  prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
+
+  def title
+    if self.properties && self.properties['title'].present?
+      self.properties['title']
+    else
+      'JIRA'
+    end
+  end
+
+  def description
+    if self.properties && self.properties['description'].present?
+      self.properties['description']
+    else
+      'Jira issue tracker'
+    end
+  end
+
+  def to_param
+    'jira'
+  end
+end
diff --git a/app/models/project_services/redmine_service.rb b/app/models/project_services/redmine_service.rb
new file mode 100644
index 00000000000..11cce3e0561
--- /dev/null
+++ b/app/models/project_services/redmine_service.rb
@@ -0,0 +1,24 @@
+class RedmineService < IssueTrackerService
+
+  prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
+
+  def title
+    if self.properties && self.properties['title'].present?
+      self.properties['title']
+    else
+      'Redmine'
+    end
+  end
+
+  def description
+    if self.properties && self.properties['description'].present?
+      self.properties['description']
+    else
+      'Redmine issue tracker'
+    end
+  end
+
+  def to_param
+    'redmine'
+  end
+end
diff --git a/app/models/service.rb b/app/models/service.rb
index 71c8aa39e45..42419475349 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -86,4 +86,12 @@ class Service < ActiveRecord::Base
   def async_execute(data)
     Sidekiq::Client.enqueue(ProjectServiceWorker, id, data)
   end
+
+  def issue_tracker?
+    self.category == :issue_tracker
+  end
+
+  def self.issue_tracker_service_list
+    Service.select(&:issue_tracker?).map{ |s| s.to_param }
+  end
 end