Merge branch...

Merge branch '341001-discussion-proper-method-naming-for-project-user-group-namespaces' into 'master'

Convert namespace methods project?, group?, and user?

See merge request gitlab-org/gitlab!70544

app/models/namespace.rb

@@ -247,27 +247,27 @@ class Namespace < ApplicationRecord
   end
 
   def kind
-    return 'group' if group?
-    return 'project' if project?
+    return 'group' if group_namespace?
+    return 'project' if project_namespace?
 
     'user' # defaults to user
   end
 
-  def group?
+  def group_namespace?
     type == Group.sti_name
   end
 
-  def project?
+  def project_namespace?
     type == Namespaces::ProjectNamespace.sti_name
   end
 
-  def user?
+  def user_namespace?
     # That last bit ensures we're considered a user namespace as a default
-    type.nil? || type == Namespaces::UserNamespace.sti_name || !(group? || project?)
+    type.nil? || type == Namespaces::UserNamespace.sti_name || !(group_namespace? || project_namespace?)
   end
 
   def owner_required?
-    user?
+    user_namespace?
   end
 
   def find_fork_of(project)
@@ -314,7 +314,7 @@ class Namespace < ApplicationRecord
   # that belongs to this namespace
   def all_projects
     if Feature.enabled?(:recursive_approach_for_all_projects, default_enabled: :yaml)
-      namespace = user? ? self : self_and_descendant_ids
+      namespace = user_namespace? ? self : self_and_descendant_ids
       Project.where(namespace: namespace)
     else
       Project.inside_path(full_path)
@@ -536,21 +536,21 @@ class Namespace < ApplicationRecord
 
   def validate_parent_type
     unless has_parent?
-      if project?
+      if project_namespace?
         errors.add(:parent_id, _('must be set for a project namespace'))
       end
 
       return
     end
 
-    if parent.project?
+    if parent.project_namespace?
       errors.add(:parent_id, _('project namespace cannot be the parent of another namespace'))
     end
 
-    if user?
+    if user_namespace?
       errors.add(:parent_id, _('cannot not be used for user namespace'))
-    elsif group?
-      errors.add(:parent_id, _('user namespace cannot be the parent of another namespace')) if parent.user?
+    elsif group_namespace?
+      errors.add(:parent_id, _('user namespace cannot be the parent of another namespace')) if parent.user_namespace?
     end
   end
 

app/models/namespace/root_storage_statistics.rb

@@ -57,7 +57,7 @@ class Namespace::RootStorageStatistics < ApplicationRecord
   end
 
   def attributes_from_personal_snippets
-    return {} unless namespace.user?
+    return {} unless namespace.user_namespace?
 
     from_personal_snippets.take.slice(SNIPPETS_SIZE_STAT_NAME)
   end

app/services/clusters/agents/refresh_authorization_service.rb

@@ -99,7 +99,7 @@ module Clusters
       end
 
       def group_root_ancestor?
-        root_ancestor.group?
+        root_ancestor.group_namespace?
       end
     end
   end

ee/app/helpers/billing_plans_helper.rb

@@ -59,7 +59,7 @@ module BillingPlansHelper
     # This can be removed once https://gitlab.com/gitlab-org/gitlab/-/issues/298715 is complete.
     return false unless current_user.last_name.present?
 
-    namespace.group? && (namespace.actual_plan_name == Plan::FREE || namespace.trial_active?)
+    namespace.group_namespace? && (namespace.actual_plan_name == Plan::FREE || namespace.trial_active?)
   end
 
   def plan_feature_list(plan)
@@ -163,7 +163,7 @@ module BillingPlansHelper
   end
 
   def billable_seats_href(namespace)
-    return unless namespace.group?
+    return unless namespace.group_namespace?
 
     group_usage_quotas_path(namespace, anchor: 'seats-quota-tab')
   end

ee/app/helpers/ee/gitlab_routing_helper.rb

@@ -71,7 +71,7 @@ module EE
     end
 
     def usage_quotas_path(namespace, *args)
-      if namespace.group?
+      if namespace.group_namespace?
         group_usage_quotas_path(namespace, *args)
       else
         profile_usage_quotas_path(*args)

ee/app/helpers/ee/namespaces_helper.rb

@@ -40,7 +40,7 @@ module EE
     end
 
     def link_to_buy_additional_minutes_path(namespace)
-      use_customer_dot_path = namespace.user? || ::Feature.disabled?(:new_route_ci_minutes_purchase, namespace, default_enabled: :yaml)
+      use_customer_dot_path = namespace.user_namespace? || ::Feature.disabled?(:new_route_ci_minutes_purchase, namespace, default_enabled: :yaml)
       return EE::SUBSCRIPTIONS_MORE_MINUTES_URL if use_customer_dot_path
 
       buy_minutes_subscriptions_path(selected_group: namespace.id)

ee/app/helpers/ee/search_helper.rb

@@ -165,7 +165,7 @@ module EE
     def allow_filtering_by_iteration?
       # We currently only have group-level iterations so we hide
       # this filter for projects under personal namespaces
-      return false if @project && @project.namespace.user?
+      return false if @project && @project.namespace.user_namespace?
 
       context = @project.presence || @group.presence
 

ee/app/helpers/ee/user_callouts_helper.rb

@@ -92,7 +92,7 @@ module EE
       return false unless namespace.bronze_plan?
       return false if user_dismissed?(EOA_BRONZE_PLAN_BANNER)
 
-      (namespace.group? && namespace.has_owner?(current_user.id)) || !namespace.group?
+      (namespace.group_namespace? && namespace.has_owner?(current_user.id)) || !namespace.group_namespace?
     end
 
     override :dismiss_two_factor_auth_recovery_settings_check

ee/app/models/ee/namespace.rb

@@ -393,7 +393,7 @@ module EE
     end
 
     def free_personal?
-      user? && !paid?
+      user_namespace? && !paid?
     end
 
     def use_elasticsearch?

ee/app/models/ee/namespace/root_storage_statistics.rb

@@ -23,7 +23,7 @@ module EE
         # the query. If this changes in the future and we add some sort of resource to
         # users that it's store in NamespaceStatistics, we will need to remove this
         # guard clause.
-        return {} unless namespace.group?
+        return {} unless namespace.group_namespace?
 
         from_namespace_statistics.take.slice(*NAMESPACE_STATISTICS_ATTRIBUTES)
       end

ee/app/models/namespace_statistics.rb

@@ -14,13 +14,13 @@ class NamespaceStatistics < ApplicationRecord
   after_save :update_root_storage_statistics, if: :saved_change_to_storage_size?
   after_destroy :update_root_storage_statistics
 
-  delegate :group?, to: :namespace
+  delegate :group_namespace?, to: :namespace
 
   COLUMNS_TO_REFRESH = [:wiki_size].freeze
 
   def refresh!(only: [])
     return if Gitlab::Database.read_only?
-    return unless group?
+    return unless group_namespace?
 
     COLUMNS_TO_REFRESH.each do |column|
       if only.empty? || only.include?(column)
@@ -44,11 +44,11 @@ class NamespaceStatistics < ApplicationRecord
   private
 
   def group_wiki_available?
-    group? && namespace.feature_available?(:group_wikis)
+    group_namespace? && namespace.feature_available?(:group_wikis)
   end
 
   def update_root_storage_statistics
-    return unless group?
+    return unless group_namespace?
 
     run_after_commit do
       Namespaces::ScheduleAggregationWorker.perform_async(namespace.id)

ee/app/services/ci/minutes/additional_packs/change_namespace_service.rb

@@ -62,7 +62,7 @@ module Ci
         end
 
         def owner_ids_for(namespace)
-          namespace.user? ? Array(namespace.owner_id) : namespace.owner_ids
+          namespace.user_namespace? ? Array(namespace.owner_id) : namespace.owner_ids
         end
       end
     end

ee/app/services/ci/minutes/email_notification_service.rb

@@ -58,7 +58,7 @@ module Ci
       end
 
       def recipients
-        namespace.user? ? [namespace.owner_email] : namespace.owners_emails
+        namespace.user_namespace? ? [namespace.owner_email] : namespace.owners_emails
       end
 
       def namespace

ee/lib/ee/api/entities/issue.rb

@@ -7,7 +7,7 @@ module EE
         extend ActiveSupport::Concern
 
         prepended do
-          with_options if: -> (issue, _) { issue.project.namespace.group? && issue.project.namespace.feature_available?(:epics) } do
+          with_options if: -> (issue, _) { issue.project.namespace.group_namespace? && issue.project.namespace.feature_available?(:epics) } do
             expose :epic_iid do |issue|
               authorized_epic_for(issue)&.iid
             end

ee/lib/gitlab/subscription_portal/clients/graphql.rb

@@ -134,7 +134,7 @@ module Gitlab
                 plan: namespace.actual_plan_name,
                 trial: !!namespace.trial?,
                 kind: namespace.kind,
-                membersCountWithDescendants: namespace.group? ? namespace.users_with_descendants.count : nil
+                membersCountWithDescendants: namespace.group_namespace? ? namespace.users_with_descendants.count : nil
               }
             end
 

ee/spec/models/ee/namespace_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe Namespace do
 
     with_them do
       before do
-        allow(namespace).to receive(:user?).and_return(user)
+        allow(namespace).to receive(:user_namespace?).and_return(user)
         allow(namespace).to receive(:paid?).and_return(paid)
       end
 

lib/api/entities/namespace_basic.rb

@@ -6,7 +6,7 @@ module API
       expose :id, :name, :path, :kind, :full_path, :parent_id, :avatar_url
 
       expose :web_url do |namespace|
-        if namespace.user?
+        if namespace.user_namespace?
           Gitlab::Routing.url_helpers.user_url(namespace.owner)
         else
           namespace.web_url

spec/models/namespace_spec.rb

@@ -175,7 +175,7 @@ RSpec.describe Namespace do
       it 'is valid' do
         expect(namespace).to be_a(Group)
         expect(namespace.kind).to eq('group')
-        expect(namespace.group?).to be_truthy
+        expect(namespace.group_namespace?).to be_truthy
       end
     end
 
@@ -186,7 +186,7 @@ RSpec.describe Namespace do
       it 'is valid' do
         expect(Namespace.find(namespace.id)).to be_a(Namespaces::ProjectNamespace)
         expect(namespace.kind).to eq('project')
-        expect(namespace.project?).to be_truthy
+        expect(namespace.project_namespace?).to be_truthy
       end
     end
 
@@ -198,7 +198,7 @@ RSpec.describe Namespace do
         #       https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68894 is ready
         expect(Namespace.find(namespace.id)).to be_a(Namespace)
         expect(namespace.kind).to eq('user')
-        expect(namespace.user?).to be_truthy
+        expect(namespace.user_namespace?).to be_truthy
       end
     end
 
@@ -208,7 +208,7 @@ RSpec.describe Namespace do
       it 'is valid' do
         expect(Namespace.find(namespace.id)).to be_a(Namespace)
         expect(namespace.kind).to eq('user')
-        expect(namespace.user?).to be_truthy
+        expect(namespace.user_namespace?).to be_truthy
       end
     end
 
@@ -218,7 +218,7 @@ RSpec.describe Namespace do
       it 'defaults to a Namespace' do
         expect(Namespace.find(namespace.id)).to be_a(Namespace)
         expect(namespace.kind).to eq('user')
-        expect(namespace.user?).to be_truthy
+        expect(namespace.user_namespace?).to be_truthy
       end
     end
   end
@@ -1558,8 +1558,8 @@ RSpec.describe Namespace do
     end
   end
 
-  describe '#user?' do
-    subject { namespace.user? }
+  describe '#user_namespace?' do
+    subject { namespace.user_namespace? }
 
     context 'when type is a user' do
       let(:user) { create(:user) }