Add latest changes from gitlab-org/gitlab@master

3 files changed, 62 insertions, 40 deletions

diff --git a/lib/gitlab/github_import/importer/diff_note_importer.rb b/lib/gitlab/github_import/importer/diff_note_importer.rb
index fff6552372b..44ffcd7a1e4 100644
--- a/lib/gitlab/github_import/importer/diff_note_importer.rb
+++ b/lib/gitlab/github_import/importer/diff_note_importer.rb
@@ -18,7 +18,6 @@ module Gitlab
         def execute
           return if merge_request_id.blank?
 
-          note.project = project
           note.merge_request = merge_request
 
           build_author_attributes
diff --git a/lib/gitlab/github_import/representation/diff_note.rb b/lib/gitlab/github_import/representation/diff_note.rb
index f3be90834c7..9259d0295d5 100644
--- a/lib/gitlab/github_import/representation/diff_note.rb
+++ b/lib/gitlab/github_import/representation/diff_note.rb
@@ -4,18 +4,15 @@ module Gitlab
   module GithubImport
     module Representation
       class DiffNote
-        include Gitlab::Utils::StrongMemoize
         include ToHash
         include ExposeAttribute
 
-        NOTEABLE_TYPE = 'MergeRequest'
         NOTEABLE_ID_REGEX = %r{/pull/(?<iid>\d+)}i.freeze
-        DISCUSSION_CACHE_KEY = 'github-importer/discussion-id-map/%{project_id}/%{noteable_id}/%{original_note_id}'
 
         expose_attribute :noteable_id, :commit_id, :file_path,
           :diff_hunk, :author, :created_at, :updated_at,
           :original_commit_id, :note_id, :end_line, :start_line,
-          :side, :in_reply_to_id
+          :side, :in_reply_to_id, :discussion_id
 
         # Builds a diff note from a GitHub API response.
         #
@@ -45,7 +42,8 @@ module Gitlab
             end_line: note[:line],
             start_line: note[:start_line],
             side: note[:side],
-            in_reply_to_id: note[:in_reply_to_id]
+            in_reply_to_id: note[:in_reply_to_id],
+            discussion_id: DiffNotes::DiscussionId.new(note).find_or_generate
           }
 
           new(hash)
@@ -59,7 +57,7 @@ module Gitlab
           new(hash)
         end
 
-        attr_accessor :merge_request, :project
+        attr_accessor :merge_request
 
         # attributes - A Hash containing the raw note details. The keys of this
         #              Hash must be Symbols.
@@ -74,7 +72,7 @@ module Gitlab
         end
 
         def noteable_type
-          NOTEABLE_TYPE
+          DiffNotes::DiscussionId::NOTEABLE_TYPE
         end
 
         def contains_suggestion?
@@ -127,12 +125,6 @@ module Gitlab
           }
         end
 
-        def discussion_id
-          strong_memoize(:discussion_id) do
-            (in_reply_to_id.present? && current_discussion_id) || generate_discussion_id
-          end
-        end
-
         private
 
         # Required by ExposeAttribute
@@ -149,32 +141,6 @@ module Gitlab
         def addition?
           side == 'RIGHT'
         end
-
-        def generate_discussion_id
-          Discussion.discussion_id(
-            Struct
-            .new(:noteable_id, :noteable_type)
-            .new(merge_request.id, NOTEABLE_TYPE)
-          ).tap do |discussion_id|
-            cache_discussion_id(discussion_id)
-          end
-        end
-
-        def cache_discussion_id(discussion_id)
-          Gitlab::Cache::Import::Caching.write(discussion_id_cache_key(note_id), discussion_id)
-        end
-
-        def current_discussion_id
-          Gitlab::Cache::Import::Caching.read(discussion_id_cache_key(in_reply_to_id))
-        end
-
-        def discussion_id_cache_key(id)
-          DISCUSSION_CACHE_KEY % {
-            project_id: project.id,
-            noteable_id: merge_request.id,
-            original_note_id: id
-          }
-        end
       end
     end
   end
diff --git a/lib/gitlab/github_import/representation/diff_notes/discussion_id.rb b/lib/gitlab/github_import/representation/diff_notes/discussion_id.rb
new file mode 100644
index 00000000000..38b560f21c0
--- /dev/null
+++ b/lib/gitlab/github_import/representation/diff_notes/discussion_id.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GithubImport
+    module Representation
+      module DiffNotes
+        class DiscussionId
+          NOTEABLE_TYPE = 'MergeRequest'
+          DISCUSSION_CACHE_REGEX = %r{/(?<repo>[^/]*)/pull/(?<iid>\d+)}i.freeze
+          DISCUSSION_CACHE_KEY = 'github-importer/discussion-id-map/%{project}/%{noteable_id}/%{original_note_id}'
+
+          def initialize(note)
+            @note = note
+            @matches = note[:html_url].match(DISCUSSION_CACHE_REGEX)
+          end
+
+          def find_or_generate
+            (note[:in_reply_to_id].present? && current_discussion_id) || generate_discussion_id
+          end
+
+          private
+
+          attr_reader :note, :matches
+
+          def generate_discussion_id
+            discussion_id = Discussion.discussion_id(
+              Struct
+              .new(:noteable_id, :noteable_type)
+              .new(matches[:iid].to_i, NOTEABLE_TYPE)
+            )
+            cache_discussion_id(discussion_id)
+          end
+
+          def cache_discussion_id(discussion_id)
+            Gitlab::Cache::Import::Caching.write(
+              discussion_id_cache_key(note[:id]), discussion_id
+            )
+          end
+
+          def current_discussion_id
+            Gitlab::Cache::Import::Caching.read(
+              discussion_id_cache_key(note[:in_reply_to_id])
+            )
+          end
+
+          def discussion_id_cache_key(id)
+            format(DISCUSSION_CACHE_KEY,
+              project: matches[:repo],
+              noteable_id: matches[:iid].to_i,
+              original_note_id: id
+            )
+          end
+        end
+      end
+    end
+  end
+end