Merge pull request #6714 from bgeuken/update_arch_controller

Refactor architecture controller service

src/api/app/controllers/webui/architectures_controller.rb

@@ -7,7 +7,7 @@ def index
   end
 
   def bulk_update_availability
-    result = ::ArchitecturesControllerService::ArchitectureUpdater.new(params[:archs]).call
+    result = ::ArchitecturesControllerService::ArchitectureUpdater.new(params).call
 
     ::Configuration.write_to_backend
 

src/api/app/services/architectures_controller_service/architecture_updater.rb

@@ -1,21 +1,22 @@
 module ArchitecturesControllerService
   class ArchitectureUpdater
-    def initialize(archs)
-      @archs = archs
-      @all_valid = true
+    def initialize(params)
+      @archs = params.require(:archs).permit!
+      @all_valid = false
     end
 
     def call
-      @archs.each do |name, value|
+      @all_valid = @archs.to_h.map do |name, value|
         arch = Architecture.find_by(name: name)
         arch.available = value
-        @all_valid &&= arch.save
+        arch.save
       end
+
       self
     end
 
     def valid?
-      @all_valid
+      @all_valid.all?
     end
   end
 end

src/api/spec/controllers/webui/architectures_controller_spec.rb

@@ -31,7 +31,7 @@
 
     context 'with valid data but failing to save' do
       before do
-        allow_any_instance_of(Architecture).to receive(:save).and_return(false)
+        allow_any_instance_of(Architecture).to receive(:valid?).and_return(false)
         request.env['HTTP_REFERER'] = root_url # Needed for the redirect_to :back
         post :bulk_update_availability, params: { archs: { i586: '1', s390x: '1' } }
       end