Apply suggestions from last code review!

ee/app/models/license.rb

@@ -6,7 +6,7 @@ class License < ApplicationRecord
   STARTER_PLAN = 'starter'.freeze
   PREMIUM_PLAN = 'premium'.freeze
   ULTIMATE_PLAN = 'ultimate'.freeze
-  ALLOWED_PERCENTAGE_OF_USERS_OVERAGE = 10
+  ALLOWED_PERCENTAGE_OF_USERS_OVERAGE = (10 / 100.0).freeze
 
   EES_FEATURES = %i[
     audit_events
@@ -563,23 +563,20 @@ class License < ApplicationRecord
     end
   end
 
-  def real_restricted_user_count
-    if previous_user_count
-      restricted_user_count
-    else
-      percent = ALLOWED_PERCENTAGE_OF_USERS_OVERAGE / 100.0
+  def restricted_user_count_with_threshold
+    # overage should only be applied for new subscriptions not for renewals.
+    return restricted_user_count if previous_user_count
 
-      (restricted_user_count * (1 + percent)).to_i
-    end
+    (restricted_user_count * (1 + ALLOWED_PERCENTAGE_OF_USERS_OVERAGE)).to_i
   end
 
   def check_users_limit
     return unless restricted_user_count
 
     if previous_user_count && (prior_historical_max <= previous_user_count)
-      return if real_restricted_user_count >= current_active_users_count
+      return if restricted_user_count >= current_active_users_count
     else
-      return if real_restricted_user_count >= prior_historical_max
+      return if restricted_user_count_with_threshold >= prior_historical_max
     end
 
     user_count = prior_historical_max == 0 ? current_active_users_count : prior_historical_max

ee/spec/models/license_spec.rb

@@ -28,6 +28,7 @@ RSpec.describe License do
     end
 
     describe '#check_users_limit' do
+      context 'for each plan' do
         before do
           create(:group_member, :guest)
           create(:group_member, :reporter)
@@ -65,7 +66,7 @@ RSpec.describe License do
         end
       end
 
-    describe 'threshold for users overage' do
+      context 'threshold for users overage' do
         let(:current_active_users_count) { 0 }
         let(:new_license) do
           gl_license = build(
@@ -109,13 +110,14 @@ RSpec.describe License do
             context 'when current active users count is under the threshold' do
               let(:current_active_users_count) { 11 }
 
-            it 'accepts the license' do
+              it 'does not accept the license' do
                 expect(new_license).not_to be_valid
               end
             end
           end
         end
       end
+    end
 
     describe "Historical active user count" do
       let(:active_user_count) { described_class.current_active_users.count + 10 }