Merge branch 'rodrigo/fix-github-import-e2e-test' into 'master'

Fix reviews import and GitHub Import E2E

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143219



Merged-by: Luke Duncalfe <lduncalfe@gitlab.com>
Approved-by: Désirée Chevalier <dchevalier@gitlab.com>
Approved-by: Sam Word <sword@gitlab.com>
Approved-by: Luke Duncalfe <lduncalfe@gitlab.com>
Reviewed-by: Sam Word <sword@gitlab.com>
Co-authored-by: Rodrigo Tomonari <rtomonari@gitlab.com>

lib/gitlab/github_import/importer/events/reviewed.rb

@@ -8,7 +8,7 @@ class Reviewed < BaseImporter
           def execute(issue_event)
             return true unless import_settings.extended_events?
 
-            review = Representation::PullRequestReview.new(
+            review = Representation::PullRequestReview.from_json_hash(
               merge_request_iid: issue_event.issuable_id,
               author: issue_event.actor&.to_hash,
               note: issue_event.body.to_s,

lib/gitlab/github_import/representation/issue_event.rb

@@ -40,7 +40,7 @@ class << self
           def from_api_response(event, additional_data = {})
             new(
               id: event[:id],
-              actor: user_representation(event[:actor]),
+              actor: user_representation(event[:actor] || event[:user]),
               event: event[:event],
               commit_id: event[:commit_id],
               label_title: event.dig(:label, :name),

qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb

@@ -34,7 +34,6 @@ def verify_status_data
             issue_event: 10,
             pull_request: 1,
             pull_request_review: 2,
-            pull_request_review_request: 1,
             diff_note: 1,
             label: 9,
             milestone: 1,

qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb

@@ -42,7 +42,6 @@ module QA
           Page::Project::Import::Github.perform do |import_page|
             import_page.add_personal_access_token(Runtime::Env.github_access_token)
 
-            import_page.select_advanced_option(:single_endpoint_issue_events_import)
             import_page.select_advanced_option(:single_endpoint_notes_import)
             import_page.select_advanced_option(:attachments_import)
 
@@ -64,7 +63,6 @@ module QA
             end
           end
 
-          # Validate :single_endpoint_issue_events_import option was triggered correctly and imported the events
           expect(imported_issue_events).to match_array(
             [
               { name: "add_label", label: "question" },

spec/lib/gitlab/github_import/importer/events/reviewed_spec.rb

@@ -13,7 +13,7 @@
   let(:extended_events) { true }
 
   let(:issue_event) do
-    Gitlab::GithubImport::Representation::IssueEvent.new(
+    Gitlab::GithubImport::Representation::IssueEvent.from_json_hash(
       id: 1196850910,
       actor: { id: user.id, login: user.username },
       event: 'reviewed',

spec/lib/gitlab/github_import/importer/issue_events_importer_spec.rb

@@ -11,7 +11,7 @@
   let(:parallel) { true }
   let(:issue_event) do
     struct = Struct.new(
-      :id, :node_id, :url, :actor, :event, :commit_id, :commit_url, :label, :rename, :milestone, :source,
+      :id, :node_id, :url, :actor, :user, :event, :commit_id, :commit_url, :label, :rename, :milestone, :source,
       :assignee, :assigner, :review_requester, :requested_reviewer, :issue, :created_at, :performed_via_github_app,
       :body, :updated_at, :submitted_at, :state, keyword_init: true
     )

spec/lib/gitlab/github_import/representation/issue_event_spec.rb

@@ -168,7 +168,7 @@
   describe '.from_api_response' do
     let(:response) do
       event_resource = Struct.new(
-        :id, :node_id, :url, :actor, :event, :commit_id, :commit_url, :label, :rename, :milestone, :state, :body,
+        :id, :node_id, :url, :actor, :user, :event, :commit_id, :commit_url, :label, :rename, :milestone, :state, :body,
         :source, :assignee, :requested_reviewer, :review_requester, :issue, :created_at, :updated_at, :submitted_at,
         :performed_via_github_app,
         keyword_init: true
@@ -179,6 +179,7 @@
         node_id: 'CE_lADOHK9fA85If7x0zwAAAAGDf0mG',
         url: 'https://api.github.com/repos/elhowm/test-import/issues/events/6501124486',
         actor: with_actor ? user_resource.new(id: 4, login: 'alice') : nil,
+        user: with_user ? user_resource.new(id: 4, login: 'alice') : nil,
         event: 'closed',
         commit_id: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d',
         commit_url: 'https://api.github.com/repos/octocat/Hello-World/commits'\
@@ -202,11 +203,25 @@
     let(:with_milestone) { true }
     let(:with_assignee) { true }
     let(:with_reviewer) { true }
+    let(:with_user) { false }
     let(:pull_request) { nil }
 
     it_behaves_like 'an IssueEvent' do
       let(:issue_event) { described_class.from_api_response(response) }
     end
+
+    context 'when event uses user instead of actor' do
+      let(:with_actor) { false }
+      let(:with_user) { true }
+
+      it 'includes the actor details' do
+        issue_event = described_class.from_api_response(response)
+
+        expect(issue_event.actor).to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+        expect(issue_event.actor.id).to eq(4)
+        expect(issue_event.actor.login).to eq('alice')
+      end
+    end
   end
 
   describe '.from_json_hash' do