Change UserCallout feautre_name to enum

3 files changed, 13 insertions, 7 deletions

diff --git a/app/controllers/user_callouts_controller.rb b/app/controllers/user_callouts_controller.rb
index 69dc444f13a..aa048a9a1fc 100644
--- a/app/controllers/user_callouts_controller.rb
+++ b/app/controllers/user_callouts_controller.rb
@@ -1,6 +1,6 @@
 class UserCalloutsController < ApplicationController
   def create
-    if ensure_callout
+    if check_feature_name && ensure_callout
       respond_to do |format|
         format.json { head :ok }
       end
@@ -13,6 +13,10 @@ class UserCalloutsController < ApplicationController
 
   private
 
+  def check_feature_name
+    UserCallout.feature_names.keys.include?(callout_param)
+  end
+
   def ensure_callout
     current_user.callouts.find_or_create_by(feature_name: callout_param)
   end
diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb
index 3725545d4cc..a292f676331 100644
--- a/app/helpers/user_callouts_helper.rb
+++ b/app/helpers/user_callouts_helper.rb
@@ -1,11 +1,6 @@
 module UserCalloutsHelper
   GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'.freeze
 
-  # Higher value = higher priority
-  PRIORITY = {
-    GKE_CLUSTER_INTEGRATION: 0
-  }.freeze
-
   def show_gke_cluster_integration_callout?(project)
     current_user && !user_dismissed?(GKE_CLUSTER_INTEGRATION) &&
       can?(current_user, :create_cluster, project)
diff --git a/app/models/user_callout.rb b/app/models/user_callout.rb
index 8b31aa6fa5c..a7cfe5df7c0 100644
--- a/app/models/user_callout.rb
+++ b/app/models/user_callout.rb
@@ -1,6 +1,13 @@
 class UserCallout < ActiveRecord::Base
   belongs_to :user
 
+  enum feature_name: {
+    gke_cluster_integration: 0
+  }
+
   validates :user, presence: true
-  validates :feature_name, presence: true, uniqueness: { scope: :user_id }
+  validates :feature_name,
+    presence: true,
+    uniqueness: { scope: :user_id },
+    inclusion: { in: UserCallout.feature_names.keys }
 end