Add Strong Params to Enterprise Fees Form

app/controllers/admin/enterprise_fees_controller.rb

@@ -34,7 +34,8 @@ module Admin
     end
 
     def bulk_update
-      @enterprise_fee_set = Forms::EnterpriseFeesBulkUpdate.new(enterprise_fee_bulk_params)
+      # Forms has strong parameters, so we don't need to validate them in controller
+      @enterprise_fee_set = Forms::EnterpriseFeesBulkUpdate.new(params)
 
       if @enterprise_fee_set.save
         redirect_to redirect_path, notice: I18n.t(:enterprise_fees_update_notice)
@@ -87,15 +88,5 @@ module Admin
 
       main_app.admin_enterprise_fees_path
     end
-
-    def enterprise_fee_bulk_params
-      params.require(:sets_enterprise_fee_set).permit(
-        collection_attributes: [
-          :id, :enterprise_id, :fee_type, :name, :tax_category_id,
-          :inherits_tax_category, :calculator_type,
-          { calculator_attributes: PermittedAttributes::Calculator.attributes }
-        ]
-      )
-    end
   end
 end

app/units/forms/enterprise_fees_bulk_update.rb

@@ -15,13 +15,15 @@ module Forms
     def save
       return false unless valid?
 
-      @enterprise_fee_set = Sets::EnterpriseFeeSet.new(@params)
+      @enterprise_fee_set = Sets::EnterpriseFeeSet.new(enterprise_fee_bulk_params)
       @enterprise_fee_set.save
       true
     end
 
+    private
+
     def check_enterprise_fee_input
-      @params['collection_attributes'].each do |_, fee_row|
+      enterprise_fee_bulk_params['collection_attributes'].each do |_, fee_row|
         enterprise_fees = fee_row['calculator_attributes']&.slice(
           :preferred_flat_percent, :preferred_amount,
           :preferred_first_item, :preferred_additional_item,
@@ -37,12 +39,12 @@ module Forms
             return false
           end
         end
-        return true
       end
+      return true
     end
 
     def check_calculators_compatibility_with_taxes
-      @params['collection_attributes'].each do |_, enterprise_fee|
+      enterprise_fee_bulk_params['collection_attributes'].each do |_, enterprise_fee|
         next unless enterprise_fee['inherits_tax_category'] == "true"
         next unless EnterpriseFee::PER_ORDER_CALCULATORS.include?(enterprise_fee['calculator_type'])
 
@@ -54,7 +56,17 @@ module Forms
         )
         return false
       end
-      true
+      return true
+    end
+
+    def enterprise_fee_bulk_params
+      @params.require(:sets_enterprise_fee_set).permit(
+        collection_attributes: [
+          :id, :enterprise_id, :fee_type, :name, :tax_category_id,
+          :inherits_tax_category, :calculator_type,
+          { calculator_attributes: PermittedAttributes::Calculator.attributes }
+        ]
+      )
     end
   end
 end