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/beacons_controller.rb

@@ -0,0 +1,76 @@
+module Beacons
+  class BeaconsController < 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
+      @beacon = Beacon.new
+    end
+
+    def create
+      success, @beacon, api_key = Beacons::Creator.new.call(beacon_params)
+
+      if success
+        flash[:notice] = "Beacon was successfully provisioned. API Key: #{api_key}"
+        redirect_to @beacon
+      else
+        prepare_associations
+        render :new, status: :unprocessable_entity
+      end
+    end
+
+    def show; end
+
+    def edit; end
+
+    def update
+      if @beacon.update(beacon_params)
+        redirect_to @beacon, notice: "Beacon was successfully updated."
+      else
+        prepare_associations
+        render :edit, status: :unprocessable_entity
+      end
+    end
+
+    def regenerate_key
+      api_key = @beacon.regenerate
+      flash[:notice] = "API key has been successfully regenerated. API Key: #{api_key}"
+      redirect_to @beacon
+
+      rescue => e
+        flash[:alert] = "API key could not be regenerated."
+        redirect_to @beacon
+    end
+
+    def revoke_key
+      api_key = @beacon.revoke!
+      flash[:notice] = "API key has been successfully revoked."
+      redirect_to @beacon
+
+      rescue => e
+        flash[:alert] = "API key could not be revoked."
+        redirect_to @beacon
+    end
+
+    private
+
+    def set_beacon
+      @beacon = Beacon.find(params[:id])
+    end
+
+    def prepare_associations
+      @languages = Language.order(:name)
+      @providers = Provider.order(:name)
+      @regions = Region.order(:name)
+      @topics = Topic.active.order(:title)
+    end
+
+    def beacon_params
+      params.require(:beacon).permit(:name, :language_id, :region_id, provider_ids: [], topic_ids: [])
+    end
+  end
+end

app/controllers/beacons_controller.rb

@@ -17,15 +17,16 @@
     resources :tags, only: %i[index], controller: "topics/tags"
   end
   resources :import_reports, only: %i[index show]
-  resources :beacons, except: :destroy do
+  resource :settings, only: [] do
+    put :provider, on: :collection
+  end
+
+  resources :beacons, except: :destroy, module: :beacons do
     member do
       post :regenerate_key
       post :revoke_key
     end
   end
-  resource :settings, only: [] do
-    put :provider, on: :collection
-  end
 
   # Render dynamic PWA files from app/views/pwa/* (remember to link manifest in application.html.erb)
   # get "manifest" => "rails/pwa#manifest", as: :pwa_manifest