enju_circulation 0.1.2 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a19e87f6e4bddd1b5a4673d552d0244660278a5a
-  data.tar.gz: a15c2eaf68a311998a0404ac2e6b7e2db9344339
+  metadata.gz: 76931b397c6efb20ca7b30e45790da3176301176
+  data.tar.gz: 6dc563892fd9c87b2a48c285e70d7147bf717e61
 SHA512:
-  metadata.gz: 6f68f1aa4ddb89f951226f2eebeab5f0e80988e3f3a5f3b3d31c605320ca3c2764cb928388eee85da093b4c8fb195ddc293ce144f5854a340e6981f2ee087b5f
-  data.tar.gz: f932c611eebbc8e9a37e773c52a06f1273a17b9a7d3d629bbed70d8e54286261ed29ce31feb75cbab09c500e1c2df45280a0f1cf222425c7411c42f11146a5b5
+  metadata.gz: 62c3010af156051a9fb7e6a6942f3d6182d39621384b17de63aa220db79e19c4eb713f17e77c10dfa8d497b9fe5cc833a5846f2a795bcf592ca0432560faaddf
+  data.tar.gz: c9237be4e65c3921626149ed8f4b8cd2a0d3a0d1681a1fb6821b802181e84b76d44f027017e428668df53654cdac44df46e829663fc0345b5299f5376d1ef5dd

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuCirculation
-{<img src="https://travis-ci.org/next-l/enju_circulation.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
-{<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_circulation?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_circulation/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.1]
+{<img src="https://travis-ci.org/next-l/enju_circulation.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
+{<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_circulation?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_circulation/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.2]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/carrier_type_has_checkout_types_controller.rb

@@ -1,12 +1,13 @@
 class CarrierTypeHasCheckoutTypesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_checkout_type
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_carrier_type_has_checkout_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_checkout_type
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /carrier_type_has_checkout_types
   # GET /carrier_type_has_checkout_types.json
   def index
-    @carrier_type_has_checkout_types = CarrierTypeHasCheckoutType.all
+    @carrier_type_has_checkout_types = CarrierTypeHasCheckoutType.page(params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
@@ -86,6 +87,15 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
   end
 
   private
+  def set_carrier_type_has_checkout_type
+    @carrier_type_has_checkout_type = CarrierTypeHasCheckoutType.find(params[:id])
+    authorize @carrier_type_has_checkout_type
+  end
+
+  def check_policy
+    authorize CarrierTypeHasCheckoutType
+  end
+
   def carrier_type_has_checkout_type_params
     params.require(:carrier_type_has_checkout_type).permit(
       :carrier_type_id, :checkout_type_id, :note

data/app/controllers/checked_items_controller.rb

@@ -1,6 +1,7 @@
 class CheckedItemsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_basket, only: [:index, :new, :create, :update]
+  before_action :set_checked_item, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_basket, only: [:index, :new, :create, :update]
 
   # GET /checked_items
   # GET /checked_items.json
@@ -54,6 +55,7 @@ class CheckedItemsController < ApplicationController
     unless @basket
       access_denied; return
     end
+    @checked_item = CheckedItem.new(checked_item_params)
     @checked_item.basket = @basket
     @checked_item.librarian = current_user
 
@@ -109,6 +111,15 @@ class CheckedItemsController < ApplicationController
   end
 
   private
+  def set_checked_item
+    @checked_item = CheckedItem.find(params[:id])
+    authorize @checked_item
+  end
+
+  def check_policy
+    authorize CheckedItem
+  end
+
   def checked_item_params
     params.fetch(:checked_item, {}).permit(
       :item_identifier, :ignore_restriction, :due_date_string

data/app/controllers/checkins_controller.rb

@@ -1,7 +1,7 @@
 class CheckinsController < ApplicationController
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
-  before_filter :get_basket, only: [:index, :create]
+  before_action :set_checkin, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_basket, only: [:index, :create]
 
   # GET /checkins
   # GET /checkins.json
@@ -61,6 +61,7 @@ class CheckinsController < ApplicationController
     unless @basket
       access_denied; return
     end
+    @checkin = Checkin.new(checkin_params)
     @checkin.basket = @basket
     @checkin.librarian = current_user
 
@@ -117,6 +118,15 @@ class CheckinsController < ApplicationController
   end
 
   private
+  def set_checkin
+    @checkin = Checkin.find(params[:id])
+    authorize @checkin
+  end
+
+  def check_policy
+    authorize Checkin
+  end
+
   def checkin_params
     params.require(:checkin).permit(:item_identifier)
   end

data/app/controllers/checkout_types_controller.rb

@@ -1,6 +1,7 @@
 class CheckoutTypesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_user_group
+  before_action :set_checkout_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_user_group
 
   # GET /checkout_types
   # GET /checkout_types.json
@@ -103,6 +104,15 @@ class CheckoutTypesController < ApplicationController
   end
 
   private
+  def set_checkout_type
+    @checkout_type = CheckoutType.find(params[:id])
+    authorize @checkout_type
+  end
+
+  def check_policy
+    authorize CheckoutType
+  end
+
   def checkout_type_params
     params.require(:checkout_type).permit(:name, :display_name, :note)
   end

data/app/controllers/checkouts_controller.rb

@@ -1,10 +1,9 @@
 class CheckoutsController < ApplicationController
-  before_filter :store_location, only: :index
-  load_and_authorize_resource except: [:index, :remove_all]
-  authorize_resource only: [:index, :remove_all]
-  before_filter :get_user, only: [:index, :remove_all]
-  before_filter :get_item, only: :index
-  after_filter :convert_charset, only: :index
+  before_action :set_checkout, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create, :remove_all]
+  before_action :get_user, only: [:index, :remove_all]
+  before_action :get_item, only: :index
+  after_action :convert_charset, only: :index
 
   # GET /checkouts
   # GET /checkouts.json
@@ -23,7 +22,7 @@ class CheckoutsController < ApplicationController
     end
 
     if params[:format] == 'txt'
-      per_page = 65534
+      per_page = 500
     else
       per_page = Checkout.default_per_page
     end
@@ -56,25 +55,16 @@ class CheckoutsController < ApplicationController
         end
       end
 
-      if current_user.try(:has_role?, 'Librarian')
-        if @item
-          item = @item
-          search.build do
-            with(:item_identifier).equal_to item.item_identifier
-          end
-        end
-      else
-        if @item
-          access_denied; return
+      if @item
+        item = @item
+        search.build do
+          with(:item_identifier).equal_to item.item_identifier
         end
       end
 
-      if params[:view] == 'overdue'
-        if params[:days_overdue]
-          date = params[:days_overdue].to_i.days.ago.beginning_of_day
-        else
-          date = 1.days.ago.beginning_of_day
-        end
+      if params[:days_overdue].present?
+        days_overdue = params[:days_overdue].to_i
+        date = days_overdue.days.ago.beginning_of_day
         search.build do
           with(:due_date).less_than date
           with(:checked_in_at).equal_to nil
@@ -97,12 +87,14 @@ class CheckoutsController < ApplicationController
         facet :reserved
       end
       page = params[:page] || 1
-      search.query.paginate(page.to_i, Checkout.default_per_page)
+      unless params[:format].to_s.downcase == 'txt'
+        search.query.paginate(page.to_i, Checkout.default_per_page)
+      end
       @checkouts = search.execute!.results
       @checkouts_facet = search.facet(:reserved).rows
     end
 
-    @days_overdue = params[:days_overdue] ||= 1
+    @days_overdue = days_overdue if days_overdue
 
     respond_to do |format|
       format.html # index.html.erb
@@ -177,6 +169,15 @@ class CheckoutsController < ApplicationController
   end
 
   private
+  def set_checkout
+    @checkout = Checkout.find(params[:id])
+    authorize @checkout
+  end
+
+  def check_policy
+    authorize Checkout
+  end
+
   def checkout_params
     params.fetch(:checkout, {}).permit(:due_date)
   end

data/app/controllers/circulation_statuses_controller.rb

@@ -1,5 +1,6 @@
 class CirculationStatusesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_circulation_status, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /circulation_statuses
   # GET /circulation_statuses.json
@@ -83,6 +84,15 @@ class CirculationStatusesController < ApplicationController
   end
 
   private
+  def set_circulation_status
+    @circulation_status = CirculationStatus.find(params[:id])
+    authorize @circulation_status
+  end
+
+  def check_policy
+    authorize CirculationStatus
+  end
+
   def circulation_status_params
     params.require(:circulation_status).permit(:name, :display_name, :note)
   end

data/app/controllers/concerns/enju_circulation/controller.rb

@@ -0,0 +1,12 @@
+module EnjuCirculation
+  module Controller
+    extend ActiveSupport::Concern
+
+    def get_checkout_type
+      if params[:checkout_type_id]
+        @checkout_type = CheckoutType.find(params[:checkout_type_id])
+        authorize @checkout_type, :show?
+      end
+    end
+  end
+end

data/app/controllers/demands_controller.rb

@@ -1,5 +1,6 @@
 class DemandsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_demand, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /demands
   # GET /demands.json
@@ -44,7 +45,7 @@ class DemandsController < ApplicationController
 
     respond_to do |format|
       if @demand.save
-        format.html { redirect_to @demand, notice: t('statistic.successfully_created', model: t('activerecord.models.demand')) }
+        format.html { redirect_to @demand, notice: t('controller.successfully_created', model: t('activerecord.models.demand')) }
         format.json { render json: @demand, status: :created, location: @demand }
       else
         format.html { render action: "new" }
@@ -79,6 +80,15 @@ class DemandsController < ApplicationController
   end
 
   private
+  def set_demand
+    @demand = Demand.find(params[:id])
+    authorize @demand
+  end
+
+  def check_policy
+    authorize Demand
+  end
+
   def demand_params
     params.fetch(:demand, {}).permit()
   end

data/app/controllers/item_has_use_restrictions_controller.rb

@@ -1,6 +1,7 @@
 class ItemHasUseRestrictionsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_item
+  before_action :set_item_has_use_restriction, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_item
 
   # GET /item_has_use_restrictions
   # GET /item_has_use_restrictions.json
@@ -29,6 +30,7 @@ class ItemHasUseRestrictionsController < ApplicationController
   # GET /item_has_use_restrictions/new
   # GET /item_has_use_restrictions/new.json
   def new
+    @item_has_use_restriction = ItemHasUseRestriction.new
     @use_restrictions = UseRestriction.all
 
     respond_to do |format|
@@ -87,6 +89,15 @@ class ItemHasUseRestrictionsController < ApplicationController
   end
 
   private
+  def set_item_has_use_restriction
+    @item_has_use_restriction = ItemHasUseRestriction.find(params[:id])
+    authorize @item_has_use_restriction
+  end
+
+  def check_policy
+    authorize ItemHasUseRestriction
+  end
+
   def item_has_use_restriction_params
     params.require(:item_has_use_restriction).permit(
       :item_id, :use_restriction_id, :use_restriction

data/app/controllers/lending_policies_controller.rb

@@ -1,12 +1,17 @@
 class LendingPoliciesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_user_group, :get_item
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_lending_policy, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_user_group, :get_item
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /lending_policies
   # GET /lending_policies.json
   def index
-    @lending_policies = LendingPolicy.page(params[:page])
+    if @item
+      @lending_policies = @item.lending_policies.page(params[:page])
+    else
+      @lending_policies = LendingPolicy.page(params[:page])
+    end
 
     respond_to do |format|
       format.html # index.html.erb
@@ -78,6 +83,15 @@ class LendingPoliciesController < ApplicationController
   end
 
   private
+  def set_lending_policy
+    @lending_policy = LendingPolicy.find(params[:id])
+    authorize @lending_policy
+  end
+
+  def check_policy
+    authorize LendingPolicy
+  end
+
   def lending_policy_params
     params.require(:lending_policy).permit(
       :item_id, :user_group_id, :loan_period, :fixed_due_date,

data/app/controllers/manifestation_checkout_stats_controller.rb

@@ -1,6 +1,7 @@
 class ManifestationCheckoutStatsController < ApplicationController
-  load_and_authorize_resource
-  after_filter :convert_charset, only: :show
+  before_action :set_manifestation_checkout_stat, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  after_action :convert_charset, only: :show
 
   # GET /manifestation_checkout_stats
   # GET /manifestation_checkout_stats.json
@@ -81,9 +82,7 @@ class ManifestationCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       if @manifestation_checkout_stat.save
-        @manifestation_checkout_stat.transition_to(:started)
-        @manifestation_checkout_stat.transition_to!(:completed)
-        #Resque.enqueue(ManifestationCheckoutStatQueue, @manifestation_checkout_stat.id)
+        ManifestationCheckoutStatJob.perform_later(@manifestation_checkout_stat)
         format.html { redirect_to @manifestation_checkout_stat, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_checkout_stat')) }
         format.json { render json: @manifestation_checkout_stat, status: :created, location: @manifestation_checkout_stat }
       else
@@ -99,7 +98,7 @@ class ManifestationCheckoutStatsController < ApplicationController
     respond_to do |format|
       if @manifestation_checkout_stat.update_attributes(manifestation_checkout_stat_params)
         if @manifestation_checkout_stat.mode == 'import'
-          Resque.enqueue(ManifestationCheckoutStatQueue, @manifestation_checkout_stat.id)
+          ManifestationCheckoutStatJob.perform_later(@manifestation_checkout_stat)
         end
         format.html { redirect_to @manifestation_checkout_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation_checkout_stat')) }
         format.json { head :no_content }
@@ -122,6 +121,15 @@ class ManifestationCheckoutStatsController < ApplicationController
   end
 
   private
+  def set_manifestation_checkout_stat
+    @manifestation_checkout_stat = ManifestationCheckoutStat.find(params[:id])
+    authorize @manifestation_checkout_stat
+  end
+
+  def check_policy
+    authorize ManifestationCheckoutStat
+  end
+
   def manifestation_checkout_stat_params
     params.require(:manifestation_checkout_stat).permit(
       :start_date, :end_date, :note, :mode

data/app/controllers/manifestation_reserve_stats_controller.rb

@@ -1,6 +1,8 @@
 class ManifestationReserveStatsController < ApplicationController
-  load_and_authorize_resource
-  after_filter :convert_charset, only: :show
+  before_action :set_manifestation_reserve_stat, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  after_action :convert_charset, only: :show
+  after_action :convert_charset, only: :show
 
   # GET /manifestation_reserve_stats
   # GET /manifestation_reserve_stats.json
@@ -53,7 +55,7 @@ class ManifestationReserveStatsController < ApplicationController
 
     respond_to do |format|
       if @manifestation_reserve_stat.save
-        Resque.enqueue(ManifestationReserveStatQueue, @manifestation_reserve_stat.id)
+        ManifestationReserveStatJob.perform_later(@manifestation_reserve_stat)
         format.html { redirect_to @manifestation_reserve_stat, notice: t('statistic.successfully_created', model: t('activerecord.models.manifestation_reserve_stat')) }
         format.json { render json: @manifestation_reserve_stat, status: :created, location: @manifestation_reserve_stat }
       else
@@ -69,7 +71,7 @@ class ManifestationReserveStatsController < ApplicationController
     respond_to do |format|
       if @manifestation_reserve_stat.update_attributes(manifestation_reserve_stat_params)
         if @manifestation_reserve_stat.mode == 'import'
-          Resque.enqueue(ManifestationReserveStatQueue, @manifestation_reserve_stat.id)
+          ManifestationReserveStatJob.perform_later(@manifestation_reserve_stat)
         end
         format.html { redirect_to @manifestation_reserve_stat, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_reserve_stat')) }
         format.json { head :no_content }
@@ -92,6 +94,15 @@ class ManifestationReserveStatsController < ApplicationController
   end
 
   private
+  def set_manifestation_reserve_stat
+    @manifestation_reserve_stat = ManifestationReserveStat.find(params[:id])
+    authorize @manifestation_reserve_stat
+  end
+
+  def check_policy
+    authorize ManifestationReserveStat
+  end
+
   def manifestation_reserve_stat_params
     params.require(:manifestation_reserve_stat).permit(
       :start_date, :end_date, :note, :mode

data/app/controllers/reserves_controller.rb

@@ -1,14 +1,12 @@
-# -*- encoding: utf-8 -*-
 class ReservesController < ApplicationController
-  before_filter :store_location, only: [:index, :new]
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
-  before_filter :prepare_options, only: [:new, :edit]
-  before_filter :get_user, only: [:index, :new]
-  before_filter :store_page
+  before_action :set_reserve, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
+  before_action :get_user, only: [:index, :new]
+  before_action :store_page
+  after_action :convert_charset, only: :index
   helper_method :get_manifestation
   helper_method :get_item
-  after_filter :convert_charset, only: :index
 
   # GET /reserves
   # GET /reserves.json
@@ -136,8 +134,9 @@ class ReservesController < ApplicationController
       @reserve.user_number = current_user.profile.user_number
     end
 
-    get_manifestation
+    @manifestation = Manifestation.where(id: params[:manifestation_id]).first
     if @manifestation
+      authorize @manifestation, :show?
       @reserve.manifestation = @manifestation
       if @reserve.user
         #@reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
@@ -250,6 +249,15 @@ class ReservesController < ApplicationController
   end
 
   private
+  def set_reserve
+    @reserve = Reserve.find(params[:id])
+    authorize @reserve
+  end
+
+  def check_policy
+    authorize Reserve
+  end
+
   def reserve_params
     if current_user.try(:has_role?, 'Librarian')
       params.fetch(:reserve, {}).permit(

data/app/controllers/use_restrictions_controller.rb

@@ -1,5 +1,6 @@
 class UseRestrictionsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_use_restriction, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /use_restrictions
   # GET /use_restrictions.json
@@ -83,6 +84,15 @@ class UseRestrictionsController < ApplicationController
   end
 
   private
+  def set_use_restriction
+    @use_restriction = UseRestriction.find(params[:id])
+    authorize @use_restriction
+  end
+
+  def check_policy
+    authorize UseRestriction
+  end
+
   def use_restriction_params
     params.require(:use_restriction).permit(:name, :display_name, :note)
   end

data/app/controllers/user_checkout_stats_controller.rb

@@ -1,6 +1,7 @@
 class UserCheckoutStatsController < ApplicationController
-  load_and_authorize_resource
-  after_filter :convert_charset, only: :show
+  before_action :set_user_checkout_stat, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  after_action :convert_charset, only: :show
 
   # GET /user_checkout_stats
   # GET /user_checkout_stats.json
@@ -53,7 +54,7 @@ class UserCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       if @user_checkout_stat.save
-        Resque.enqueue(UserCheckoutStatQueue, @user_checkout_stat.id)
+        UserCheckoutStatJob.perform_later(@user_checkout_stat)
         format.html { redirect_to @user_checkout_stat, notice: t('statistic.successfully_created', model: t('activerecord.models.user_checkout_stat')) }
         format.json { render json: @user_checkout_stat, status: :created, location: @user_checkout_stat }
       else
@@ -69,7 +70,7 @@ class UserCheckoutStatsController < ApplicationController
     respond_to do |format|
       if @user_checkout_stat.update_attributes(user_checkout_stat_params)
         if @user_checkout_stat.mode == 'import'
-          Resque.enqueue(UserCheckoutStatQueue, @user_checkout_stat.id)
+          UserCheckoutStatJob.perform_later(@user_checkout_stat)
         end
         format.html { redirect_to @user_checkout_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.user_checkout_stat')) }
         format.json { head :no_content }
@@ -92,6 +93,15 @@ class UserCheckoutStatsController < ApplicationController
   end
 
   private
+  def set_user_checkout_stat
+    @user_checkout_stat = UserCheckoutStat.find(params[:id])
+    authorize @user_checkout_stat
+  end
+
+  def check_policy
+    authorize UserCheckoutStat
+  end
+
   def user_checkout_stat_params
     params.require(:user_checkout_stat).permit(
       :start_date, :end_date, :note, :mode

data/app/controllers/user_group_has_checkout_types_controller.rb

@@ -1,7 +1,8 @@
 class UserGroupHasCheckoutTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_user_group_has_checkout_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
   helper_method :get_user_group, :get_checkout_type
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /user_group_has_checkout_types
   # GET /user_group_has_checkout_types.json
@@ -85,6 +86,15 @@ class UserGroupHasCheckoutTypesController < ApplicationController
   end
 
   private
+  def set_user_group_has_checkout_type
+    @user_group_has_checkout_type = UserGroupHasCheckoutType.find(params[:id])
+    authorize @user_group_has_checkout_type
+  end
+
+  def check_policy
+    authorize UserGroupHasCheckoutType
+  end
+
   def user_group_has_checkout_type_params
     params.require(:user_group_has_checkout_type).permit(
       :user_group_id, :checkout_type_id,

data/app/controllers/user_reserve_stats_controller.rb

@@ -1,6 +1,7 @@
 class UserReserveStatsController < ApplicationController
-  load_and_authorize_resource
-  after_filter :convert_charset, only: :show
+  before_action :set_user_reserve_stat, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  after_action :convert_charset, only: :show
 
   # GET /user_reserve_stats
   # GET /user_reserve_stats.json
@@ -53,7 +54,7 @@ class UserReserveStatsController < ApplicationController
 
     respond_to do |format|
       if @user_reserve_stat.save
-        Resque.enqueue(UserReserveStatQueue, @user_reserve_stat.id)
+        UserReserveStatJob.perform_later(@user_reserve_stat)
         format.html { redirect_to @user_reserve_stat, notice: t('statistic.successfully_created', model: t('activerecord.models.user_reserve_stat')) }
         format.json { render json: @user_reserve_stat, status: :created, location: @user_reserve_stat }
       else
@@ -69,7 +70,7 @@ class UserReserveStatsController < ApplicationController
     respond_to do |format|
       if @user_reserve_stat.update_attributes(user_reserve_stat_params)
         if @user_reserve_stat.mode == 'import'
-          Resque.enqueue(UserReserveStatQueue, @user_reserve_stat.id)
+          UserReserveStatJob.perform_later(@user_reserve_stat)
         end
         format.html { redirect_to @user_reserve_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.user_reserve_stat')) }
         format.json { head :no_content }
@@ -92,6 +93,15 @@ class UserReserveStatsController < ApplicationController
   end
 
   private
+  def set_user_reserve_stat
+    @user_reserve_stat = UserReserveStat.find(params[:id])
+    authorize @user_reserve_stat
+  end
+
+  def check_policy
+    authorize UserReserveStat
+  end
+
   def user_reserve_stat_params
     params.require(:user_reserve_stat).permit(
       :start_date, :end_date, :note, :mode