1 files changed, 5 insertions, 15 deletions
diff --git a/app/services/service_ping/permit_data_categories_service.rb b/app/services/service_ping/permit_data_categories_service.rb
index ff48c022b56..d8fa255a485 100644
--- a/app/services/service_ping/permit_data_categories_service.rb
+++ b/app/services/service_ping/permit_data_categories_service.rb
@@ -2,10 +2,10 @@
 
 module ServicePing
   class PermitDataCategoriesService
-    STANDARD_CATEGORY = 'Standard'
-    SUBSCRIPTION_CATEGORY = 'Subscription'
-    OPERATIONAL_CATEGORY = 'Operational'
-    OPTIONAL_CATEGORY = 'Optional'
+    STANDARD_CATEGORY = 'standard'
+    SUBSCRIPTION_CATEGORY = 'subscription'
+    OPERATIONAL_CATEGORY = 'operational'
+    OPTIONAL_CATEGORY = 'optional'
     CATEGORIES = [
       STANDARD_CATEGORY,
       SUBSCRIPTION_CATEGORY,
@@ -14,20 +14,10 @@ module ServicePing
     ].to_set.freeze
 
     def execute
-      return [] unless product_intelligence_enabled?
+      return [] unless ServicePingSettings.product_intelligence_enabled?
 
       CATEGORIES
     end
-
-    def product_intelligence_enabled?
-      pings_enabled? && !User.single_user&.requires_usage_stats_consent?
-    end
-
-    private
-
-    def pings_enabled?
-      ::Gitlab::CurrentSettings.usage_ping_enabled?
-    end
   end
 end