1 files changed, 13 insertions, 23 deletions
diff --git a/app/models/users_statistics.rb b/app/models/users_statistics.rb
index a903541f69a..a314ae8920b 100644
--- a/app/models/users_statistics.rb
+++ b/app/models/users_statistics.rb
@@ -3,12 +3,6 @@
 class UsersStatistics < ApplicationRecord
   scope :order_created_at_desc, -> { order(created_at: :desc) }
 
-  class << self
-    def latest
-      order_created_at_desc.first
-    end
-  end
-
   def active
     [
       without_groups_and_projects,
@@ -26,30 +20,26 @@ class UsersStatistics < ApplicationRecord
   end
 
   class << self
-    def create_current_stats!
-      stats_by_role = highest_role_stats
+    def latest
+      order_created_at_desc.first
+    end
 
-      create!(
-        without_groups_and_projects: without_groups_and_projects_stats,
-        with_highest_role_guest: stats_by_role[:guest],
-        with_highest_role_reporter: stats_by_role[:reporter],
-        with_highest_role_developer: stats_by_role[:developer],
-        with_highest_role_maintainer: stats_by_role[:maintainer],
-        with_highest_role_owner: stats_by_role[:owner],
-        bots: bot_stats,
-        blocked: blocked_stats
-      )
+    def create_current_stats!
+      create!(highest_role_stats)
     end
 
     private
 
     def highest_role_stats
       {
-        owner: batch_count_for_access_level(Gitlab::Access::OWNER),
-        maintainer: batch_count_for_access_level(Gitlab::Access::MAINTAINER),
-        developer: batch_count_for_access_level(Gitlab::Access::DEVELOPER),
-        reporter: batch_count_for_access_level(Gitlab::Access::REPORTER),
-        guest: batch_count_for_access_level(Gitlab::Access::GUEST)
+        without_groups_and_projects: without_groups_and_projects_stats,
+        with_highest_role_guest: batch_count_for_access_level(Gitlab::Access::GUEST),
+        with_highest_role_reporter: batch_count_for_access_level(Gitlab::Access::REPORTER),
+        with_highest_role_developer: batch_count_for_access_level(Gitlab::Access::DEVELOPER),
+        with_highest_role_maintainer: batch_count_for_access_level(Gitlab::Access::MAINTAINER),
+        with_highest_role_owner: batch_count_for_access_level(Gitlab::Access::OWNER),
+        bots: bot_stats,
+        blocked: blocked_stats
       }
     end