Commit 350b0578 authored by Brett Walker's avatar Brett Walker

Convert namespace method group?

into group_namespace?
parent a66880a3
......@@ -247,13 +247,13 @@ class Namespace < ApplicationRecord
end
def kind
return 'group' if group?
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
......@@ -263,7 +263,7 @@ class Namespace < ApplicationRecord
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_namespace?)
type.nil? || type == Namespaces::UserNamespace.sti_name || !(group_namespace? || project_namespace?)
end
def owner_required?
......@@ -549,7 +549,7 @@ class Namespace < ApplicationRecord
if user_namespace?
errors.add(:parent_id, _('cannot not be used for user namespace'))
elsif group?
elsif group_namespace?
errors.add(:parent_id, _('user namespace cannot be the parent of another namespace')) if parent.user_namespace?
end
end
......
......@@ -99,7 +99,7 @@ module Clusters
end
def group_root_ancestor?
root_ancestor.group?
root_ancestor.group_namespace?
end
end
end
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -393,7 +393,7 @@ module EE
end
def free_personal?
user? && !paid?
user_namespace? && !paid?
end
def use_elasticsearch?
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -283,7 +283,7 @@ module Gitlab
token_handler = Gitlab::LfsToken.new(actor)
authentication_abilities =
if token_handler.user_namespace?
if token_handler.user?
read_write_project_authentication_abilities
elsif token_handler.deploy_key_pushable?(project)
read_write_authentication_abilities
......
......@@ -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
......@@ -1558,7 +1558,7 @@ RSpec.describe Namespace do
end
end
describe '#user?' do
describe '#user_namespace?' do
subject { namespace.user_namespace? }
context 'when type is a user' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment