Fix code structure

app/controllers/projects/feature_flags_controller.rb

@@ -8,16 +8,16 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
   before_action :feature_flag, only: [:edit, :update, :destroy]
 
   def index
-    @feature_flags = project.project_feature_flags
-    @unleash_instanceid = project.project_feature_flags_access_tokens.first&.token || project.project_feature_flags_access_tokens.create!.token
+    @feature_flags = project.operations_feature_flags
+    @unleash_instanceid = project.feature_flag_access_token
   end
 
   def new
-    @feature_flag = project.project_feature_flags.new
+    @feature_flag = project.operations_feature_flags.new
   end
 
   def create
-    @feature_flag = project.project_feature_flags.create(create_params)
+    @feature_flag = project.operations_feature_flags.create(create_params)
 
     if @feature_flag.persisted?
       flash[:notice] = 'Feature flag was successfully created.'
@@ -50,16 +50,16 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
   protected
 
   def feature_flag
-    @feature_flag ||= project.project_feature_flags.find(params[:id])
+    @feature_flag ||= project.operations_feature_flags.find(params[:id])
   end
 
   def create_params
-    params.require(:project_feature_flag)
+    params.require(:operations_feature_flag)
           .permit(:name, :description, :active)
   end
 
   def update_params
-    params.require(:project_feature_flag)
+    params.require(:operations_feature_flag)
           .permit(:description, :active)
   end
 end

app/models/operations/feature_flag.rb

-class ProjectFeatureFlag < ActiveRecord::Base
-  belongs_to :project
+module Operations
+  class FeatureFlag < ActiveRecord::Base
+    self.table_name = 'operations_feature_flags'
 
-  validates :project, presence: true
-  validates :name,
-    presence: true,
-    length: 2..63,
-    format: {
-      with: Gitlab::Regex.feature_flag_regex,
-      message: Gitlab::Regex.feature_flag_regex_message
-    }
+    belongs_to :project
+
+    validates :project, presence: true
+    validates :name,
+      presence: true,
+      length: 2..63,
+      format: {
+        with: Gitlab::Regex.feature_flag_regex,
+        message: Gitlab::Regex.feature_flag_regex_message
+      }
+  end
 end

app/models/operations/feature_flag_access_token.rb

-class ProjectFeatureFlagsAccessToken < ActiveRecord::Base
-  include TokenAuthenticatable
-
-  belongs_to :project
-
-  validates :project, presence: true
-  validates :token, presence: true
-
-  add_authentication_token_field :token
-
-  before_validation :ensure_token!
-end

app/models/operations/feature_flags_access_token.rb

+module Operations
+  class FeatureFlagsAccessToken < ActiveRecord::Base
+    include TokenAuthenticatable
+
+    self.table_name = 'operations_feature_flags_access_tokens'
+
+    belongs_to :project
+
+    validates :project, presence: true
+    validates :token, presence: true
+
+    add_authentication_token_field :token
+
+    before_validation :ensure_token!
+  end
+end

app/models/project.rb

@@ -266,8 +266,8 @@ class Project < ActiveRecord::Base
   has_many :project_deploy_tokens
   has_many :deploy_tokens, through: :project_deploy_tokens
 
-  has_many :project_feature_flags
-  has_many :project_feature_flags_access_tokens
+  has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
+  has_one :operations_feature_flags_access_token, class_name: 'Operations::FeatureFlagsAccessToken'
 
   has_one :auto_devops, class_name: 'ProjectAutoDevops'
   has_many :custom_attributes, class_name: 'ProjectCustomAttribute'
@@ -2105,6 +2105,10 @@ class Project < ActiveRecord::Base
     auto_cancel_pending_pipelines == 'enabled'
   end
 
+  def feature_flag_access_token
+    (operations_feature_flags_access_token || create_operations_feature_flags_access_token!).token
+  end
+
   private
 
   # rubocop: disable CodeReuse/ServiceClass

lib/api/entities.rb

@@ -1525,7 +1525,7 @@ module API
 
     class UnleashFeatures < Grape::Entity
       expose :version
-      expose :project_feature_flags, as: :features, with: UnleashFeature
+      expose :operations_feature_flags, as: :features, with: UnleashFeature
 
       private