Merge branch 'kassio/gitlab-importer-ignore-some-validation-when-importing' into 'master'

Gitlab Importer - Skip some validations in Project/Group import

See merge request gitlab-org/gitlab!49935

app/models/label_priority.rb

 # frozen_string_literal: true
 
 class LabelPriority < ApplicationRecord
+  include Importable
+
   belongs_to :project
   belongs_to :label
 
-  validates :project, :label, :priority, presence: true
+  validates :label, presence: true, unless: :importing?
+  validates :project, :priority, presence: true
   validates :label_id, uniqueness: { scope: :project_id }
   validates :priority, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
 end

app/models/resource_event.rb

@@ -30,14 +30,6 @@ class ResourceEvent < ApplicationRecord
 
     return true if issuable_count == 1
 
-    # if none of issuable IDs is set, check explicitly if nested issuable
-    # object is set, this is used during project import
-    if issuable_count == 0 && importing?
-      issuable_count = self.class.issuable_attrs.count { |attr| self.public_send(attr) } # rubocop:disable GitlabSecurity/PublicSend
-
-      return true if issuable_count == 1
-    end
-
     errors.add(
       :base, _("Exactly one of %{attributes} is required") %
         { attributes: self.class.issuable_attrs.join(', ') }

app/models/resource_label_event.rb

@@ -12,7 +12,7 @@ class ResourceLabelEvent < ResourceEvent
   scope :inc_relations, -> { includes(:label, :user) }
 
   validates :label, presence: { unless: :importing? }, on: :create
-  validate :exactly_one_issuable
+  validate :exactly_one_issuable, unless: :importing?
 
   after_save :expire_etag_cache
   after_destroy :expire_etag_cache

app/models/sentry_issue.rb

 # frozen_string_literal: true
 
 class SentryIssue < ApplicationRecord
+  include Importable
+
   belongs_to :issue
 
-  validates :issue, uniqueness: true, presence: true
+  validates :issue, uniqueness: true
+  validates :issue, presence: true, unless: :importing?
   validates :sentry_issue_identifier, presence: true
   validate :ensure_sentry_issue_identifier_is_unique_per_project
 

app/models/suggestion.rb

 # frozen_string_literal: true
 
 class Suggestion < ApplicationRecord
+  include Importable
   include Suggestible
 
   belongs_to :note, inverse_of: :suggestions
-  validates :note, presence: true
+  validates :note, presence: true, unless: :importing?
   validates :commit_id, presence: true, if: :applied?
 
   delegate :position, :noteable, to: :note

app/models/timelog.rb

 # frozen_string_literal: true
 
 class Timelog < ApplicationRecord
+  include Importable
+
   validates :time_spent, :user, presence: true
-  validate :issuable_id_is_present
+  validate :issuable_id_is_present, unless: :importing?
 
   belongs_to :issue, touch: true
   belongs_to :merge_request, touch: true

app/models/zoom_meeting.rb

 # frozen_string_literal: true
 
 class ZoomMeeting < ApplicationRecord
+  include Importable
   include UsageStatistics
 
-  belongs_to :project, optional: false
-  belongs_to :issue, optional: false
+  belongs_to :project
+  belongs_to :issue
+
+  validates :project, presence: true, unless: :importing?
+  validates :issue, presence: true, unless: :importing?
 
   validates :url, presence: true, length: { maximum: 255 }, zoom_url: true
-  validates :issue, same_project_association: true
+  validates :issue, same_project_association: true, unless: :importing?
 
   enum issue_status: {
     added: 1,

spec/models/label_priority_spec.rb

@@ -18,5 +18,11 @@ RSpec.describe LabelPriority do
 
       expect(subject).to validate_uniqueness_of(:label_id).scoped_to(:project_id)
     end
+
+    describe 'when importing' do
+      subject { create(:label_priority, importing: true) }
+
+      it { is_expected.not_to validate_presence_of(:label) }
+    end
   end
 end

spec/models/sentry_issue_spec.rb

@@ -27,6 +27,12 @@ RSpec.describe SentryIssue do
       expect(duplicate_sentry_issue).to be_invalid
       expect(duplicate_sentry_issue.errors.full_messages.first).to include('is already associated')
     end
+
+    describe 'when importing' do
+      subject { create(:sentry_issue, importing: true) }
+
+      it { is_expected.not_to validate_presence_of(:issue) }
+    end
   end
 
   describe 'callbacks' do

spec/models/suggestion_spec.rb

@@ -12,6 +12,12 @@ RSpec.describe Suggestion do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:note) }
 
+    context 'when importing' do
+      subject { create(:suggestion, importing: true) }
+
+      it { is_expected.not_to validate_presence_of(:note) }
+    end
+
     context 'when suggestion is applied' do
       before do
         allow(subject).to receive(:applied?).and_return(true)

spec/models/timelog_spec.rb

@@ -40,6 +40,14 @@ RSpec.describe Timelog do
 
       expect(subject).to be_valid
     end
+
+    describe 'when importing' do
+      it 'is valid if issue_id and merge_request_id are missing' do
+        subject.attributes = { issue: nil, merge_request: nil, importing: true }
+
+        expect(subject).to be_valid
+      end
+    end
   end
 
   describe 'scopes' do

spec/models/zoom_meeting_spec.rb

@@ -12,8 +12,8 @@ RSpec.describe ZoomMeeting do
   end
 
   describe 'Associations' do
-    it { is_expected.to belong_to(:project).required }
-    it { is_expected.to belong_to(:issue).required }
+    it { is_expected.to belong_to(:project) }
+    it { is_expected.to belong_to(:issue) }
   end
 
   describe 'scopes' do
@@ -40,6 +40,16 @@ RSpec.describe ZoomMeeting do
   end
 
   describe 'Validations' do
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_presence_of(:issue) }
+
+    describe 'when importing' do
+      subject { build(:zoom_meeting, importing: true) }
+
+      it { is_expected.not_to validate_presence_of(:project) }
+      it { is_expected.not_to validate_presence_of(:issue) }
+    end
+
     describe 'url' do
       it { is_expected.to validate_presence_of(:url) }
       it { is_expected.to validate_length_of(:url).is_at_most(255) }