Introduce new hook data builders for Issue and MergeRequest

Signed-off-by: Rémy Coutable <remy@rymai.me>

3 files changed, 139 insertions, 2 deletions

diff --git a/lib/gitlab/hook_data/issuable_builder.rb b/lib/gitlab/hook_data/issuable_builder.rb
index e817c6af94a..4febb0ab430 100644
--- a/lib/gitlab/hook_data/issuable_builder.rb
+++ b/lib/gitlab/hook_data/issuable_builder.rb
@@ -1,6 +1,8 @@
 module Gitlab
   module HookData
     class IssuableBuilder
+      CHANGES_KEYS = %i[previous current].freeze
+
       attr_accessor :issuable
 
       def initialize(issuable)
@@ -14,7 +16,7 @@ module Gitlab
           project: issuable.project.hook_attrs,
           object_attributes: issuable.hook_attrs,
           labels: issuable.labels.map(&:hook_attrs),
-          changes: changes.slice(*safe_keys),
+          changes: final_changes(changes.slice(*safe_keys)),
           # DEPRECATED
           repository: issuable.project.hook_attrs.slice(:name, :url, :description, :homepage)
         }
@@ -29,7 +31,25 @@ module Gitlab
       end
 
       def safe_keys
-        issuable.class.safe_hook_attributes + issuable.class.safe_hook_relations
+        issuable_builder::SAFE_HOOK_ATTRIBUTES + issuable_builder::SAFE_HOOK_RELATIONS
+      end
+
+      private
+
+      def issuable_builder
+        case issuable
+        when Issue
+          Gitlab::HookData::IssueBuilder
+        when MergeRequest
+          Gitlab::HookData::MergeRequestBuilder
+        end
+      end
+
+      def final_changes(changes_hash)
+        changes_hash.reduce({}) do |hash, (key, changes_array)|
+          hash[key] = Hash[CHANGES_KEYS.zip(changes_array)]
+          hash
+        end
       end
     end
   end
diff --git a/lib/gitlab/hook_data/issue_builder.rb b/lib/gitlab/hook_data/issue_builder.rb
new file mode 100644
index 00000000000..de9cab80a02
--- /dev/null
+++ b/lib/gitlab/hook_data/issue_builder.rb
@@ -0,0 +1,55 @@
+module Gitlab
+  module HookData
+    class IssueBuilder
+      SAFE_HOOK_ATTRIBUTES = %i[
+        assignee_id
+        author_id
+        branch_name
+        closed_at
+        confidential
+        created_at
+        deleted_at
+        description
+        due_date
+        id
+        iid
+        last_edited_at
+        last_edited_by_id
+        milestone_id
+        moved_to_id
+        project_id
+        relative_position
+        state
+        time_estimate
+        title
+        updated_at
+        updated_by_id
+      ].freeze
+
+      SAFE_HOOK_RELATIONS = %i[
+        assignees
+        labels
+      ].freeze
+
+      attr_accessor :issue
+
+      def initialize(issue)
+        @issue = issue
+      end
+
+      def build
+        attrs = {
+          url: Gitlab::UrlBuilder.build(issue),
+          total_time_spent: issue.total_time_spent,
+          human_total_time_spent: issue.human_total_time_spent,
+          human_time_estimate: issue.human_time_estimate,
+          assignee_ids: issue.assignee_ids,
+          assignee_id: issue.assignee_ids.first # This key is deprecated
+        }
+
+        issue.attributes.with_indifferent_access.slice(*SAFE_HOOK_ATTRIBUTES)
+          .merge!(attrs)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb
new file mode 100644
index 00000000000..eaef19c9d04
--- /dev/null
+++ b/lib/gitlab/hook_data/merge_request_builder.rb
@@ -0,0 +1,62 @@
+module Gitlab
+  module HookData
+    class MergeRequestBuilder
+      SAFE_HOOK_ATTRIBUTES = %i[
+        assignee_id
+        author_id
+        created_at
+        deleted_at
+        description
+        head_pipeline_id
+        id
+        iid
+        last_edited_at
+        last_edited_by_id
+        merge_commit_sha
+        merge_error
+        merge_params
+        merge_status
+        merge_user_id
+        merge_when_pipeline_succeeds
+        milestone_id
+        ref_fetched
+        source_branch
+        source_project_id
+        state
+        target_branch
+        target_project_id
+        time_estimate
+        title
+        updated_at
+        updated_by_id
+      ].freeze
+
+      SAFE_HOOK_RELATIONS = %i[
+        assignee
+        labels
+      ].freeze
+
+      attr_accessor :merge_request
+
+      def initialize(merge_request)
+        @merge_request = merge_request
+      end
+
+      def build
+        attrs = {
+          url: Gitlab::UrlBuilder.build(merge_request),
+          source: merge_request.source_project.try(:hook_attrs),
+          target: merge_request.target_project.hook_attrs,
+          last_commit: merge_request.diff_head_commit&.hook_attrs,
+          work_in_progress: merge_request.work_in_progress?,
+          total_time_spent: merge_request.total_time_spent,
+          human_total_time_spent: merge_request.human_total_time_spent,
+          human_time_estimate: merge_request.human_time_estimate
+        }
+
+        merge_request.attributes.with_indifferent_access.slice(*SAFE_HOOK_ATTRIBUTES)
+          .merge!(attrs)
+      end
+    end
+  end
+end