Merge branch '11927-migration-fix' into 'master'

Fix MigrateApproverToApprovalRules migration

See merge request gitlab-org/gitlab-ee!13947

ee/changelogs/unreleased/11927-migration-fix.yml

+---
+title: Fix "rule_type does not exist" error during consume_remaining_migrate_approver_to_approval_rules_in_batch_jobs migration
+merge_request: 13947
+author:
+type: fixed

ee/lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb

@@ -33,6 +33,32 @@ module Gitlab
         def project
           merge_request.target_project
         end
+
+        def self.find_or_create_code_owner_rule(merge_request, pattern)
+          merge_request.approval_rules.safe_find_or_create_by(
+            code_owner: true,
+            name: pattern
+          )
+        end
+
+        def self.safe_find_or_create_by(*args)
+          safe_ensure_unique(retries: 1) do
+            find_or_create_by(*args)
+          end
+        end
+
+        def self.safe_ensure_unique(retries: 0)
+          transaction(requires_new: true) do
+            yield
+          end
+        rescue ActiveRecord::RecordNotUnique
+          if retries > 0
+            retries -= 1
+            retry
+          end
+
+          false
+        end
       end
 
       class ApprovalMergeRequestRuleSource < ActiveRecord::Base
@@ -73,7 +99,21 @@ module Gitlab
           return if state == 'merged' || state == 'closed'
 
           Gitlab::GitalyClient.allow_n_plus_1_calls do
-            ::MergeRequest.find(id).sync_code_owners_with_approvers
+            owners = ::MergeRequest.find(id).code_owners
+
+            if owners.present?
+              ApplicationRecord.transaction do
+                rule = approval_rules.code_owner.first
+                rule ||= ApprovalMergeRequestRule.find_or_create_code_owner_rule(
+                  self,
+                  'Code Owner'
+                )
+
+                rule.users = owners.uniq
+              end
+            else
+              approval_rules.code_owner.delete_all
+            end
           end
         end
       end

ee/spec/lib/gitlab/background_migration/migrate_approver_to_approval_rules_spec.rb

@@ -203,9 +203,12 @@ describe Gitlab::BackgroundMigration::MigrateApproverToApprovalRules do
           it 'creates rule' do
             expect do
               described_class.new.perform(target_type, target.id)
-            end.to change { target.approval_rules.code_owner.count }.by(1)
+            end.to change { target.approval_rules.count }.by(1)
 
-            expect(target.approval_rules.code_owner.first.users).to contain_exactly(*owners)
+            rule = target.approval_rules.first
+
+            expect(rule.read_attribute(:code_owner)).to eq(true)
+            expect(rule.users).to contain_exactly(*owners)
           end
         end