enju_circulation 0.1.0.pre36 → 0.1.0.pre37

data/app/controllers/reserves_controller.rb

@@ -1,14 +1,13 @@
 # -*- 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 :get_user, :only => [:index, :new]
+  before_filter :store_location, only: [:index, :new]
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
+  before_filter :get_user, only: [:index, :new]
   before_filter :store_page
   helper_method :get_manifestation
   helper_method :get_item
-  after_filter :convert_charset, :only => :index
-  cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
+  after_filter :convert_charset, only: :index
 
   # GET /reserves
   # GET /reserves.json
@@ -16,7 +15,7 @@ class ReservesController < ApplicationController
     unless current_user.has_role?('Librarian')
       if @user
         if current_user == @user
-          redirect_to reserves_url(:format => params[:format])
+          redirect_to reserves_url(format: params[:format])
           return
         else
           access_denied; return
@@ -36,7 +35,7 @@ class ReservesController < ApplicationController
       sort_column = :created_at
       order = :desc
     end
-    if params[:format].to_s.downcase == 'csv'
+    if params[:format].to_s.downcase == 'txt'
       page = 1
       per_page = 65534
     else
@@ -104,10 +103,10 @@ class ReservesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @reserves }
-      format.rss  { render :layout => false }
+      format.json { render json: @reserves }
+      format.rss  { render layout: false }
       format.atom
-      format.csv
+      format.txt
     end
   end
 
@@ -116,7 +115,7 @@ class ReservesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @reserve }
+      format.json { render json: @reserve }
     end
   end
 
@@ -133,7 +132,7 @@ class ReservesController < ApplicationController
           access_denied; return
         end
       end
-      @reserve.user_number = current_user.user_number
+      @reserve.user_number = current_user.profile.user_number
     end
 
     get_manifestation
@@ -175,13 +174,13 @@ class ReservesController < ApplicationController
 
     respond_to do |format|
       if @reserve.save
-        @reserve.sm_request!
+        @reserve.transition_to!(:requested)
 
-        format.html { redirect_to @reserve, :notice => t('controller.successfully_created', :model => t('activerecord.models.reserve')) }
-        format.json { render :json => @reserve, :status => :created, :location => reserve_url(@reserve) }
+        format.html { redirect_to @reserve, notice: t('controller.successfully_created', model: t('activerecord.models.reserve')) }
+        format.json { render json: @reserve, status: :created, location: reserve_url(@reserve) }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @reserve.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @reserve.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -190,40 +189,40 @@ class ReservesController < ApplicationController
   # PUT /reserves/1.json
   def update
     if current_user.has_role?('Librarian')
-      @reserve.assign_attributes(params[:reserve], :as => :admin)
+      @reserve.assign_attributes(params[:reserve], as: :admin)
     else
       if @reserve.user != current_user
         access_denied; return
       end
-      @reserve.assign_attributes(params[:reserve], :as => :user_update)
+      @reserve.assign_attributes(params[:reserve], as: :user_update)
     end
 
     if @reserve.valid?
       if params[:mode] == 'cancel'
-        @reserve.sm_cancel!
+        @reserve.transition_to!(:canceled)
       else
         if @reserve.retained?
           if @reserve.item_identifier and @reserve.force_retaining == '1'
-            @reserve.sm_retain!
+            @reserve.transition_to!(:retained)
           end
         else
-          @reserve.sm_retain! if @reserve.item_identifier
+          @reserve.transition_to!(:retained) if @reserve.item_identifier
         end
       end
     end
 
     respond_to do |format|
       if @reserve.save
-        if @reserve.state == 'canceled'
+        if @reserve.current_state == 'canceled'
           flash[:notice] = t('reserve.reservation_was_canceled')
         else
-          flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.reserve'))
+          flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.reserve'))
         end
         format.html { redirect_to @reserve }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @reserve.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @reserve.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -244,7 +243,7 @@ class ReservesController < ApplicationController
     end
 
     respond_to do |format|
-      format.html { redirect_to reserves_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.reserve')) }
+      format.html { redirect_to reserves_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.reserve')) }
       format.json { head :no_content }
     end
   end

data/app/controllers/user_checkout_stats_controller.rb

@@ -1,6 +1,6 @@
 class UserCheckoutStatsController < ApplicationController
   load_and_authorize_resource
-  after_filter :convert_charset, :only => :show
+  after_filter :convert_charset, only: :show
 
   # GET /user_checkout_stats
   # GET /user_checkout_stats.json
@@ -9,14 +9,14 @@ class UserCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @user_checkout_stats }
+      format.json { render json: @user_checkout_stats }
     end
   end
 
   # GET /user_checkout_stats/1
   # GET /user_checkout_stats/1.json
   def show
-    if params[:format] == 'csv'
+    if params[:format] == 'txt'
       per_page = 65534
     else
       per_page = CheckoutStatHasUser.default_per_page
@@ -25,8 +25,8 @@ class UserCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @user_checkout_stat }
-      format.csv
+      format.json { render json: @user_checkout_stat }
+      format.txt
     end
   end
 
@@ -37,7 +37,7 @@ class UserCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @user_checkout_stat }
+      format.json { render json: @user_checkout_stat }
     end
   end
 
@@ -49,14 +49,16 @@ class UserCheckoutStatsController < ApplicationController
   # POST /user_checkout_stats.json
   def create
     @user_checkout_stat = UserCheckoutStat.new(params[:user_checkout_stat])
+    @user_checkout_stat.user = current_user
 
     respond_to do |format|
       if @user_checkout_stat.save
-        format.html { redirect_to @user_checkout_stat, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_checkout_stat')) }
-        format.json { render :json => @user_checkout_stat, :status => :created, :location => @user_checkout_stat }
+        Resque.enqueue(UserCheckoutStatQueue, @user_checkout_stat.id)
+        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
-        format.html { render :action => "new" }
-        format.json { render :json => @user_checkout_stat.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @user_checkout_stat.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -69,11 +71,11 @@ class UserCheckoutStatsController < ApplicationController
         if @user_checkout_stat.mode == 'import'
           Resque.enqueue(UserCheckoutStatQueue, @user_checkout_stat.id)
         end
-        format.html { redirect_to @user_checkout_stat, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_checkout_stat')) }
+        format.html { redirect_to @user_checkout_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.user_checkout_stat')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @user_checkout_stat.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @user_checkout_stat.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/user_group_has_checkout_types_controller.rb

@@ -1,7 +1,7 @@
 class UserGroupHasCheckoutTypesController < ApplicationController
   load_and_authorize_resource
   helper_method :get_user_group, :get_checkout_type
-  before_filter :prepare_options, :only => [:new, :edit]
+  before_filter :prepare_options, only: [:new, :edit]
 
   # GET /user_group_has_checkout_types
   # GET /user_group_has_checkout_types.json
@@ -10,7 +10,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @user_group_has_checkout_types }
+      format.json { render json: @user_group_has_checkout_types }
     end
   end
 
@@ -19,7 +19,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @user_group_has_checkout_type }
+      format.json { render json: @user_group_has_checkout_type }
     end
   end
 
@@ -33,7 +33,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @user_group_has_checkout_type }
+      format.json { render json: @user_group_has_checkout_type }
     end
   end
 
@@ -48,12 +48,12 @@ class UserGroupHasCheckoutTypesController < ApplicationController
 
     respond_to do |format|
       if @user_group_has_checkout_type.save
-        format.html { redirect_to(@user_group_has_checkout_type, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_group_has_checkout_type'))) }
-        format.json { render :json => @user_group_has_checkout_type, :status => :created, :location => @user_group_has_checkout_type }
+        format.html { redirect_to(@user_group_has_checkout_type, notice: t('controller.successfully_created', model: t('activerecord.models.user_group_has_checkout_type'))) }
+        format.json { render json: @user_group_has_checkout_type, status: :created, location: @user_group_has_checkout_type }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @user_group_has_checkout_type.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @user_group_has_checkout_type.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -63,12 +63,12 @@ class UserGroupHasCheckoutTypesController < ApplicationController
   def update
     respond_to do |format|
       if @user_group_has_checkout_type.update_attributes(params[:user_group_has_checkout_type])
-        format.html { redirect_to @user_group_has_checkout_type, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_group_has_checkout_type')) }
+        format.html { redirect_to @user_group_has_checkout_type, notice: t('controller.successfully_updated', model: t('activerecord.models.user_group_has_checkout_type')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @user_group_has_checkout_type.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @user_group_has_checkout_type.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/user_reserve_stats_controller.rb

@@ -1,6 +1,6 @@
 class UserReserveStatsController < ApplicationController
   load_and_authorize_resource
-  after_filter :convert_charset, :only => :show
+  after_filter :convert_charset, only: :show
 
   # GET /user_reserve_stats
   # GET /user_reserve_stats.json
@@ -9,14 +9,14 @@ class UserReserveStatsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @user_reserve_stats }
+      format.json { render json: @user_reserve_stats }
     end
   end
 
   # GET /user_reserve_stats/1
   # GET /user_reserve_stats/1.json
   def show
-    if params[:format] == 'csv'
+    if params[:format] == 'txt'
       per_page = 65534
     else
       per_page = ReserveStatHasUser.default_per_page
@@ -25,8 +25,8 @@ class UserReserveStatsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @user_reserve_stat }
-      format.csv
+      format.json { render json: @user_reserve_stat }
+      format.txt
     end
   end
 
@@ -37,7 +37,7 @@ class UserReserveStatsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @user_reserve_stat }
+      format.json { render json: @user_reserve_stat }
     end
   end
 
@@ -49,14 +49,16 @@ class UserReserveStatsController < ApplicationController
   # POST /user_reserve_stats.json
   def create
     @user_reserve_stat = UserReserveStat.new(params[:user_reserve_stat])
+    @user_reserve_stat.user = current_user
 
     respond_to do |format|
       if @user_reserve_stat.save
-        format.html { redirect_to @user_reserve_stat, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_reserve_stat')) }
-        format.json { render :json => @user_reserve_stat, :status => :created, :location => @user_reserve_stat }
+        Resque.enqueue(UserReserveStatQueue, @user_reserve_stat.id)
+        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
-        format.html { render :action => "new" }
-        format.json { render :json => @user_reserve_stat.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @user_reserve_stat.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -69,11 +71,11 @@ class UserReserveStatsController < ApplicationController
         if @user_reserve_stat.mode == 'import'
           Resque.enqueue(UserReserveStatQueue, @user_reserve_stat.id)
         end
-        format.html { redirect_to @user_reserve_stat, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_reserve_stat')) }
+        format.html { redirect_to @user_reserve_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.user_reserve_stat')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @user_reserve_stat.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @user_reserve_stat.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/carrier_type_has_checkout_type.rb

@@ -1,16 +1,16 @@
 class CarrierTypeHasCheckoutType < ActiveRecord::Base
   attr_accessible :carrier_type_id, :checkout_type_id, :note
-  scope :available_for_carrier_type, lambda {|carrier_type| {:include => :carrier_type, :conditions => ['carrier_types.name = ?', carrier_type.name]}}
-  scope :available_for_user_group, lambda {|user_group| {:include => {:checkout_type => :user_groups}, :conditions => ['user_groups.name = ?', user_group.name]}}
+  scope :available_for_carrier_type, lambda {|carrier_type| {:include => :carrier_type, conditions: ['carrier_types.name = ?', carrier_type.name]}}
+  scope :available_for_user_group, lambda {|user_group| {:include => {:checkout_type => :user_groups}, conditions: ['user_groups.name = ?', user_group.name]}}
 
-  belongs_to :carrier_type, :validate => true
-  belongs_to :checkout_type, :validate => true
+  belongs_to :carrier_type, validate: true
+  belongs_to :checkout_type, validate: true
 
   validates_presence_of :carrier_type, :checkout_type
   validates_associated :carrier_type, :checkout_type
-  validates_uniqueness_of :checkout_type_id, :scope => :carrier_type_id
+  validates_uniqueness_of :checkout_type_id, scope: :carrier_type_id
 
-  acts_as_list :scope => :carrier_type_id
+  acts_as_list scope: :carrier_type_id
 end
 
 # == Schema Information

data/app/models/checked_item.rb

@@ -1,36 +1,38 @@
 class CheckedItem < ActiveRecord::Base
   attr_accessible :item_identifier, :ignore_restriction, :due_date_string
-  belongs_to :item #, :validate => true
-  belongs_to :basket #, :validate => true
-  belongs_to :librarian, :class_name => 'User' #, :validate => true
-
-  validates_associated :item, :basket, :on => :update
-  validates_presence_of :item, :basket, :due_date, :on => :update
-  validates_uniqueness_of :item_id, :scope => :basket_id
-  validate :available_for_checkout?, :on => :create
-  validates :due_date_string, :format => {:with => /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, :allow_blank => true
+  belongs_to :item #, validate: true
+  belongs_to :basket #, validate: true
+  belongs_to :librarian, class_name: 'User' #, validate: true
+
+  validates_associated :item, :basket, on: :update
+  validates_presence_of :item, :basket, :due_date, on: :update
+  validates_uniqueness_of :item_id, scope: :basket_id
+  validate :available_for_checkout?, on: :create
+  validates :due_date_string, format: {with: /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, allow_blank: true
   validate :check_due_date
  
   before_validation :set_item
-  before_validation :set_due_date, :on => :create
+  before_validation :set_due_date, on: :create
   normalize_attributes :item_identifier
 
   attr_protected :user_id
   attr_accessor :item_identifier, :ignore_restriction, :due_date_string
 
   def available_for_checkout?
-    if self.item.blank?
+    if item.blank?
       errors[:base] << I18n.t('activerecord.errors.messages.checked_item.item_not_found')
       return false
     end
 
     if item.rent?
-      errors[:base] << I18n.t('activerecord.errors.messages.checked_item.already_checked_out')
+      unless item.circulation_status.name == 'Missing'
+        errors[:base] << I18n.t('activerecord.errors.messages.checked_item.already_checked_out')
+      end
     end
 
     unless item.available_for_checkout?
       if item.circulation_status.name == 'Missing'
-        item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+        item.circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
         item.save
         set_due_date
       else
@@ -45,15 +47,15 @@ class CheckedItem < ActiveRecord::Base
     end
     # ここまでは絶対に貸出ができない場合
 
-    return true if self.ignore_restriction == "1"
+    return true if ignore_restriction == "1"
 
     if item.not_for_loan?
       errors[:base] << I18n.t('activerecord.errors.messages.checked_item.not_available_for_checkout')
     end
 
     if item.reserved?
-      if self.item.manifestation.next_reservation.user == self.basket.user
-        self.item.manifestation.next_reservation.sm_complete
+      if item.manifestation.next_reservation.user == basket.user
+        item.manifestation.next_reservation.transition_to!(:completed)
       else
         errors[:base] << I18n.t('activerecord.errors.messages.checked_item.reserved_item_included')
       end
@@ -74,7 +76,7 @@ class CheckedItem < ActiveRecord::Base
 
   def item_checkout_type
     if item and basket
-      basket.user.user_group.user_group_has_checkout_types.available_for_item(item).first
+      basket.user.profile.user_group.user_group_has_checkout_types.available_for_item(item).first
     end
   end
 
@@ -108,7 +110,7 @@ class CheckedItem < ActiveRecord::Base
   def set_item
     identifier = item_identifier.to_s.strip
     if identifier.present?
-      item = Item.where(:item_identifier => identifier).first
+      item = Item.where(item_identifier: identifier).first
       self.item = item
     end
   end

data/app/models/checkin.rb

@@ -1,15 +1,15 @@
 class Checkin < ActiveRecord::Base
   attr_accessible :item_identifier
-  default_scope :order => 'checkins.id DESC'
-  scope :on, lambda {|date| {:conditions => ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
+  default_scope order: 'checkins.id DESC'
+  scope :on, lambda {|date| {conditions: ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
   has_one :checkout
   belongs_to :item
-  belongs_to :librarian, :class_name => 'User'
+  belongs_to :librarian, class_name: 'User'
   belongs_to :basket
 
-  validates_uniqueness_of :item_id, :scope => :basket_id
+  validates_uniqueness_of :item_id, scope: :basket_id
   validates_presence_of :item_id, :basket_id
-  validate :available_for_checkin?, :on => :create
+  validate :available_for_checkin?, on: :create
   before_validation :set_item
 
   attr_accessor :item_identifier
@@ -34,19 +34,18 @@ class Checkin < ActiveRecord::Base
   def item_checkin(current_user)
     message = ''
     Checkin.transaction do
-      checkouts = Checkout.not_returned.where(:item_id => item_id).select(
-        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version, :created_at, :checkout_renewal_count]
-      )
       item.checkin!
-      checkouts.each do |checkout|
+      Checkout.not_returned.where(item_id: item_id).select(
+        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version, :created_at, :checkout_renewal_count]
+      ).each do |checkout|
         # TODO: ILL時の処理
         checkout.checkin = self
         checkout.operator = current_user
-        unless checkout.user.try(:save_checkout_history)
+        unless checkout.user.profile.try(:save_checkout_history)
           checkout.user = nil
         end
-        checkout.save(:validate => false)
-        unless checkout.item.shelf.library == current_user.library
+        checkout.save(validate: false)
+        unless checkout.item.shelf.library == current_user.profile.library
           message << I18n.t('checkin.other_library_item')
         end
       end
@@ -67,7 +66,7 @@ class Checkin < ActiveRecord::Base
 
       # メールとメッセージの送信
       #ReservationNotifier.deliver_reserved(item.manifestation.reserves.first.user, item.manifestation)
-      #Message.create(:sender => current_user, :receiver => item.manifestation.next_reservation.user, :subject => message_template.title, :body => message_template.body, :recipient => item.manifestation.next_reservation.user)
+      #Message.create(sender: current_user, receiver: item.manifestation.next_reservation.user, subject: message_template.title, body: message_template.body, recipient: item.manifestation.next_reservation.user)
     end
     if message.present?
       message
@@ -79,7 +78,7 @@ class Checkin < ActiveRecord::Base
   def set_item
     identifier = item_identifier.to_s.strip
     if identifier.present?
-      item = Item.where(:item_identifier => identifier).first
+      item = Item.where(item_identifier: identifier).first
       self.item = item
     end
   end

data/app/models/checkout.rb

@@ -1,27 +1,27 @@
 class Checkout < ActiveRecord::Base
   attr_accessible :due_date
-  default_scope :order => 'checkouts.id DESC'
+  default_scope order: 'checkouts.id DESC'
   scope :not_returned, where(:checkin_id => nil)
   scope :returned, where('checkin_id IS NOT NULL')
-  scope :overdue, lambda {|date| {:conditions => ['checkin_id IS NULL AND due_date < ?', date]}}
+  scope :overdue, lambda {|date| {conditions: ['checkin_id IS NULL AND due_date < ?', date]}}
   scope :due_date_on, lambda {|date| where(:checkin_id => nil, :due_date => date.beginning_of_day .. date.end_of_day)}
-  scope :completed, lambda {|start_date, end_date| {:conditions => ['created_at >= ? AND created_at < ?', start_date, end_date]}}
-  scope :on, lambda {|date| {:conditions => ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
+  scope :completed, lambda {|start_date, end_date| {conditions: ['created_at >= ? AND created_at < ?', start_date, end_date]}}
+  scope :on, lambda {|date| {conditions: ['created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day]}}
 
-  belongs_to :user #, :counter_cache => true #, :validate => true
+  belongs_to :user
   delegate :username, :user_number, :to => :user, :prefix => true
-  belongs_to :item #, :counter_cache => true #, :validate => true
-  belongs_to :checkin #, :validate => true
-  belongs_to :librarian, :class_name => 'User' #, :validate => true
-  belongs_to :basket #, :validate => true
+  belongs_to :item
+  belongs_to :checkin
+  belongs_to :librarian, class_name: 'User'
+  belongs_to :basket
 
   validates_associated :user, :item, :librarian, :checkin #, :basket
   # TODO: 貸出履歴を保存しない場合は、ユーザ名を削除する
   #validates_presence_of :user, :item, :basket
   validates_presence_of :item_id, :basket_id, :due_date
-  validates_uniqueness_of :item_id, :scope => [:basket_id, :user_id]
-  validate :is_not_checked?, :on => :create
-  validate :renewable?, :on => :update
+  validates_uniqueness_of :item_id, scope: [:basket_id, :user_id]
+  validate :is_not_checked?, on: :create
+  validate :renewable?, on: :update
   validates_date :due_date
 
   searchable do
@@ -29,7 +29,7 @@ class Checkout < ActiveRecord::Base
       user.try(:username)
     end
     string :user_number do
-      user.try(:user_number)
+      user.try(:profile).try(:user_number)
     end
     string :item_identifier do
       item.try(:item_identifier)
@@ -49,7 +49,7 @@ class Checkout < ActiveRecord::Base
   paginates_per 10
 
   def is_not_checked?
-    checkout = Checkout.not_returned.where(:item_id => item_id)
+    checkout = Checkout.not_returned.where(item_id: item_id)
     unless checkout.empty?
       errors[:base] << I18n.t('activerecord.errors.messages.checkin.already_checked_out')
     end
@@ -115,7 +115,7 @@ class Checkout < ActiveRecord::Base
   end
 
   def self.manifestations_count(start_date, end_date, manifestation)
-    completed(start_date, end_date).where(:item_id => manifestation.items.pluck('items.id')).count
+    completed(start_date, end_date).where(item_id: manifestation.items.pluck('items.id')).count
   end
 
   def self.send_due_date_notification
@@ -123,9 +123,9 @@ class Checkout < ActiveRecord::Base
     queues = []
     User.find_each do |user|
       # 未来の日時を指定する
-      checkouts = user.checkouts.due_date_on(user.user_group.number_of_day_to_notify_due_date.days.from_now.beginning_of_day)
+      checkouts = user.checkouts.due_date_on(user.profile.user_group.number_of_day_to_notify_due_date.days.from_now.beginning_of_day)
       unless checkouts.empty?
-        queues << user.send_message(template, :manifestations => checkouts.collect(&:item).collect(&:manifestation))
+        queues << user.send_message(template, manifestations: checkouts.collect(&:item).collect(&:manifestation))
       end
     end
     queues.size
@@ -135,10 +135,10 @@ class Checkout < ActiveRecord::Base
     template = 'recall_overdue_item'
     queues = []
     User.find_each do |user|
-      user.user_group.number_of_time_to_notify_overdue.times do |i|
-        checkouts = user.checkouts.due_date_on((user.user_group.number_of_day_to_notify_overdue * (i + 1)).days.ago.beginning_of_day)
+      user.profile.user_group.number_of_time_to_notify_overdue.times do |i|
+        checkouts = user.checkouts.due_date_on((user.profile.user_group.number_of_day_to_notify_overdue * (i + 1)).days.ago.beginning_of_day)
         unless checkouts.empty?
-          queues << user.send_message(template, :manifestations => checkouts.collect(&:item).collect(&:manifestation))
+          queues << user.profile.user.send_message(template, manifestations: checkouts.collect(&:item).collect(&:manifestation))
         end
       end
     end
@@ -166,4 +166,3 @@ end
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #
-