Merge branch '58886-issue-tracker-fields' into 'master'

Create models for issue trackers data

See merge request gitlab-org/gitlab-ce!28598

4 files changed, 66 insertions, 0 deletions

diff --git a/app/models/project_services/data_fields.rb b/app/models/project_services/data_fields.rb
new file mode 100644
index 00000000000..438d85098c8
--- /dev/null
+++ b/app/models/project_services/data_fields.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module DataFields
+  extend ActiveSupport::Concern
+
+  included do
+    has_one :issue_tracker_data
+    has_one :jira_tracker_data
+  end
+end
diff --git a/app/models/project_services/issue_tracker_data.rb b/app/models/project_services/issue_tracker_data.rb
new file mode 100644
index 00000000000..2c1d28ed421
--- /dev/null
+++ b/app/models/project_services/issue_tracker_data.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class IssueTrackerData < ApplicationRecord
+  belongs_to :service
+
+  delegate :activated?, to: :service, allow_nil: true
+
+  validates :service, presence: true
+  validates :project_url, presence: true, public_url: { enforce_sanitization: true }, if: :activated?
+  validates :issues_url, presence: true, public_url: { enforce_sanitization: true }, if: :activated?
+  validates :new_issue_url, public_url: { enforce_sanitization: true }, if: :activated?
+
+  def self.encryption_options
+    {
+      key: Settings.attr_encrypted_db_key_base_32,
+      encode: true,
+      mode: :per_attribute_iv,
+      algorithm: 'aes-256-gcm'
+    }
+  end
+
+  attr_encrypted :project_url, encryption_options
+  attr_encrypted :issues_url, encryption_options
+  attr_encrypted :new_issue_url, encryption_options
+end
diff --git a/app/models/project_services/jira_tracker_data.rb b/app/models/project_services/jira_tracker_data.rb
new file mode 100644
index 00000000000..4f528e3d81b
--- /dev/null
+++ b/app/models/project_services/jira_tracker_data.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class JiraTrackerData < ApplicationRecord
+  belongs_to :service
+
+  delegate :activated?, to: :service, allow_nil: true
+
+  validates :service, presence: true
+  validates :url, public_url: { enforce_sanitization: true }, presence: true, if: :activated?
+  validates :api_url, public_url: { enforce_sanitization: true }, allow_blank: true
+  validates :username, presence: true, if: :activated?
+  validates :password, presence: true, if: :activated?
+  validates :jira_issue_transition_id,
+            format: { with: Gitlab::Regex.jira_transition_id_regex, message: s_("JiraService|transition ids can have only numbers which can be split with , or ;") },
+            allow_blank: true
+
+  def self.encryption_options
+    {
+      key: Settings.attr_encrypted_db_key_base_32,
+      encode: true,
+      mode: :per_attribute_iv,
+      algorithm: 'aes-256-gcm'
+    }
+  end
+
+  attr_encrypted :url, encryption_options
+  attr_encrypted :api_url, encryption_options
+  attr_encrypted :username, encryption_options
+  attr_encrypted :password, encryption_options
+end
diff --git a/app/models/service.rb b/app/models/service.rb
index 9896aa12e90..16fbe6648cc 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -6,6 +6,7 @@ class Service < ApplicationRecord
   include Sortable
   include Importable
   include ProjectServicesLoggable
+  include DataFields
 
   serialize :properties, JSON # rubocop:disable Cop/ActiveRecordSerialize