Migrate ghost logic to user_type column

User type column was filled with proper data for `ghost`
users in previous commits, so here we move logic
from old column to new column

app/models/user.rb

@@ -323,7 +323,7 @@ class User < ApplicationRecord
   scope :external, -> { where(external: true) }
   scope :active, -> { with_state(:active).non_internal }
   scope :active_without_ghosts, -> { with_state(:active).without_ghosts }
-  scope :without_ghosts, -> { where('ghost IS NOT TRUE') }
+  scope :without_ghosts, -> { humans.or(where.not(user_type: :ghost)) }
   scope :deactivated, -> { with_state(:deactivated).non_internal }
   scope :without_projects, -> { joins('LEFT JOIN project_authorizations ON users.id = project_authorizations.user_id').where(project_authorizations: { user_id: nil }) }
   scope :order_recent_sign_in, -> { reorder(Gitlab::Database.nulls_last_order('current_sign_in_at', 'DESC')) }
@@ -624,7 +624,7 @@ class User < ApplicationRecord
     # owns records previously belonging to deleted users.
     def ghost
       email = 'ghost%s@example.com'
-      unique_internal(where(ghost: true, user_type: :ghost), 'ghost', email) do |u|
+      unique_internal(where(user_type: :ghost), 'ghost', email) do |u|
         u.bio = _('This is a "Ghost User", created to hold all issues authored by users that have since been deleted. This user cannot be removed.')
         u.name = 'Ghost User'
       end
@@ -664,17 +664,8 @@ class User < ApplicationRecord
     ghost? || (bot? && !project_bot?)
   end
 
-  # We are transitioning from ghost boolean column to user_type
-  # so we need to read from old column for now
-  # @see https://gitlab.com/gitlab-org/gitlab/-/issues/210025
-  def ghost?
-    ghost
-  end
-
-  # The explicit check for project_bot will be removed with Bot Categorization
-  # Ref: https://gitlab.com/gitlab-org/gitlab/-/issues/213945
   def self.internal
-    where(ghost: true).or(bots_without_project_bot)
+    where(user_type: :ghost).or(bots)
   end
 
   # The explicit check for project_bot will be removed with Bot Categorization

ee/spec/models/user_spec.rb

@@ -90,7 +90,7 @@ describe User do
     describe '.active_without_ghosts' do
       let_it_be(:user1) { create(:user, :external) }
       let_it_be(:user2) { create(:user, state: 'blocked') }
-      let_it_be(:user3) { create(:user, ghost: true) }
+      let_it_be(:user3) { create(:user, :ghost) }
       let_it_be(:user4) { create(:user, user_type: :support_bot) }
       let_it_be(:user5) { create(:user, state: 'blocked', user_type: :support_bot) }
 
@@ -637,7 +637,7 @@ describe User do
         end
 
         context 'when user is a ghost' do
-          let(:user) { create(:user, ghost: true) }
+          let(:user) { create(:user, :ghost) }
 
           it 'returns false' do
             expect(user.using_license_seat?).to eq false

spec/factories/users.rb

@@ -40,7 +40,7 @@ FactoryBot.define do
     end
 
     trait :ghost do
-      ghost { true }
+      user_type { :ghost }
       after(:build) { |user, _| user.block! }
     end
 

spec/models/user_spec.rb

@@ -813,7 +813,7 @@ describe User, :do_not_mock_admin_mode do
     describe '.active_without_ghosts' do
       let_it_be(:user1) { create(:user, :external) }
       let_it_be(:user2) { create(:user, state: 'blocked') }
-      let_it_be(:user3) { create(:user, ghost: true) }
+      let_it_be(:user3) { create(:user, :ghost) }
       let_it_be(:user4) { create(:user) }
 
       it 'returns all active users but ghost users' do
@@ -824,7 +824,7 @@ describe User, :do_not_mock_admin_mode do
     describe '.without_ghosts' do
       let_it_be(:user1) { create(:user, :external) }
       let_it_be(:user2) { create(:user, state: 'blocked') }
-      let_it_be(:user3) { create(:user, ghost: true) }
+      let_it_be(:user3) { create(:user, :ghost) }
 
       it 'returns users without ghosts users' do
         expect(described_class.without_ghosts).to match_array([user1, user2])
@@ -3275,7 +3275,6 @@ describe User, :do_not_mock_admin_mode do
       expect(ghost.namespace).not_to be_nil
       expect(ghost.namespace).to be_persisted
       expect(ghost.user_type).to eq 'ghost'
-      expect(ghost.ghost).to eq true
     end
 
     it "does not create a second ghost user if one is already present" do
@@ -4077,7 +4076,7 @@ describe User, :do_not_mock_admin_mode do
 
     context 'in single-user environment' do
       it 'requires user consent after one week' do
-        create(:user, ghost: true)
+        create(:user, :ghost)
 
         expect(user.requires_usage_stats_consent?).to be true
       end
@@ -4503,7 +4502,7 @@ describe User, :do_not_mock_admin_mode do
         where(:attributes) do
           [
             { state: 'blocked' },
-            { ghost: true },
+            { user_type: :ghost },
             { user_type: :alert_bot }
           ]
         end
@@ -4546,7 +4545,7 @@ describe User, :do_not_mock_admin_mode do
 
     context 'when user is a ghost user' do
       before do
-        user.update(ghost: true)
+        user.update(user_type: :ghost)
       end
 
       it { is_expected.to be false }
@@ -4585,7 +4584,7 @@ describe User, :do_not_mock_admin_mode do
 
     context 'when user is an internal user' do
       before do
-        user.update(ghost: true)
+        user.update(user_type: :ghost)
       end
 
       it { is_expected.to be User::LOGIN_FORBIDDEN }

spec/views/admin/users/_user.html.haml_spec.rb

@@ -9,7 +9,7 @@ describe 'admin/users/_user.html.haml' do
 
   context 'internal users' do
     context 'when showing a `Ghost User`' do
-      let(:user) { create(:user, ghost: true) }
+      let(:user) { create(:user, :ghost) }
 
       it 'does not render action buttons' do
         render

spec/workers/update_highest_role_worker_spec.rb

@@ -18,7 +18,6 @@ describe UpdateHighestRoleWorker, :clean_gitlab_redis_shared_state do
       let(:active_attributes) do
         {
           state: 'active',
-          ghost: false,
           user_type: nil
         }
       end
@@ -54,7 +53,6 @@ describe UpdateHighestRoleWorker, :clean_gitlab_redis_shared_state do
         where(:additional_attributes) do
           [
             { state: 'blocked' },
-            { ghost: true },
             { user_type: :alert_bot }
           ]
         end