More review changes

Author: FionaLMcLaren

app/controllers/beacons/base_controller.rb

@@ -0,0 +1,11 @@
+module Beacons
+  class BaseController < ApplicationController
+    before_action :redirect_contributors
+
+    private
+
+    def redirect_contributors
+      redirect_to root_path, alert: "You don't have permission to access this page." unless Current.user&.is_admin?
+    end
+  end
+end

app/controllers/beacons_controller.rb …ontrollers/beacons/beacons_controller.rbapp/controllers/beacons_controller.rb renamed to app/controllers/beacons/beacons_controller.rb app/controllers/beacons_controller.rb renamed to app/controllers/beacons/beacons_controller.rb

@@ -1,33 +1,31 @@
-class BeaconsController < ApplicationController
-  before_action :redirect_contributors
+class BeaconsController < Beacons::BaseController
   before_action :set_beacon, only: %i[show edit update regenerate_key revoke_key]
+  before_action :prepare_associations, only: %i[new edit]
 
   def index
     @beacons = Beacon.includes(:language, :region, :providers, :topics).order(created_at: :desc)
   end
 
   def new
-    prepare_associations
+    @beacon = Beacon.new
   end
 
   def create
     success, @beacon, api_key = Beacons::Creator.new.call(beacon_params)
 
     case Beacons::Creator.new.call(beacon_params)
-    when [true, @beacon, api_key]
+    when [ true, @beacon, api_key ]
       flash[:notice] = "Beacon was successfully provisioned. API Key: #{api_key}"
       redirect_to @beacon
-    when [false, _, _]
+    when [ false, _, _ ]
       prepare_associations
       render :new, status: :unprocessable_entity
     end
   end
 
   def show; end
 
-  def edit
-    prepare_associations
-  end
+  def edit; end
 
   def update
     if @beacon.update(beacon_params)
@@ -74,8 +72,4 @@ def prepare_associations
   def beacon_params
     params.require(:beacon).permit(:name, :language_id, :region_id, provider_ids: [], topic_ids: [])
   end
-  
-  def redirect_contributors
-    redirect_to root_path, alert: "You don't have permission to access this page." unless Current.user&.is_admin?
-  end
 end