enju_circulation 0.2.0.beta.3 → 0.2.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1d84454c986115d3db9e73886c0abfca5f76df
-  data.tar.gz: 3fbd2b6d37dabd55eee9c0e5c7ec2d48aceef3c7
+  metadata.gz: 70e88e19ea6e53056364cf7f3ded68df0ca1ff8a
+  data.tar.gz: bfb54de863b490dde5ab42e8d60d01047ef22158
 SHA512:
-  metadata.gz: 4990f4b9e09874aa760dbfbee3315ab1899b1b10238d2e862e6d64b7185fa2d0eced8f381b1bccd3b2abfdedc54b6b65ad1fb43c315a05341280dc31a89d978c
-  data.tar.gz: 6e467c07538e1332b66ac99b6ad846bd5e74cb9aa62618b7e02e0a90f550dc20afba6d6deb4daa19f196c55edab7094da42db44e81f37e2ebebc0bc35293fb82
+  metadata.gz: c4f05624b087d7e3b1822ada2f5333476013e4034bd7ccb43915502852eefbd2529c0863bacbab0a4ecf838eb4ecc543d9067875758b4de282493fdee072c64b
+  data.tar.gz: 79b6fb73a6e1004eb2e9cf3a764cbed4e7b3a50af0c1400ffe58d151a28862c1ec589680a6cf5166b4f44340bfecf043dbb6fd9949abbacfd8b920906e31bbd1

data/app/controllers/checkouts_controller.rb

@@ -21,10 +21,12 @@ class CheckoutsController < ApplicationController
       end
     end
 
-    if params[:format] == 'txt'
+    if ['txt', 'rss'].include?(params[:format].to_s.downcase)
       per_page = 500
+      page = 1
     else
       per_page = Checkout.default_per_page
+      page = params[:page] || 1
     end
 
     unless icalendar_user
@@ -86,10 +88,7 @@ class CheckoutsController < ApplicationController
         order_by :created_at, :desc
         facet :reserved
       end
-      page = params[:page] || 1
-      unless params[:format].to_s.downcase == 'txt'
-        search.query.paginate(page.to_i, Checkout.default_per_page)
-      end
+      search.query.paginate(page.to_i, per_page)
       @checkouts = search.execute!.results
       @checkouts_facet = search.facet(:reserved).rows
     end

data/app/controllers/reserves_controller.rb

@@ -34,12 +34,12 @@ class ReservesController < ApplicationController
       sort_column = :created_at
       order = :desc
     end
-    if params[:format].to_s.downcase == 'txt'
+    if ['txt', 'rss'].include?(params[:format].to_s.downcase)
+      per_page = 500
       page = 1
-      per_page = 65534
     else
-      page ||= params[:page] || 1
-      per_page ||= Reserve.default_per_page
+      per_page = Reserve.default_per_page
+      page = params[:page] || 1
     end
 
     if params[:mode] == 'hold' and current_user.has_role?('Librarian')

data/app/helpers/items_helper.rb

@@ -7,10 +7,10 @@ module ItemsHelper
       current = true if params[:circulation_status] == circulation_status.name
       if current
         content_tag :strong do
-          link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
+          link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
+        link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
       end
     end
   end

data/app/models/concerns/enju_circulation/enju_accept.rb

@@ -11,6 +11,7 @@ module EnjuCirculation
       item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
       use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
       item.use_restriction = use_restriction if use_restriction
+      item.index
     end
   end
 end

data/app/models/concerns/enju_circulation/enju_item.rb

@@ -100,20 +100,21 @@ module EnjuCirculation
     def retain(librarian)
       self.class.transaction do
         reservation = manifestation.next_reservation
-        unless reservation.nil?
+        if reservation
           reservation.item = self
-          reservation.transition_to!(:retained)
+          reservation.transition_to!(:retained) unless reservation.retained?
           reservation.send_message(librarian)
         end
       end
     end
 
     def retained?
-      if manifestation.next_reservation.try(:current_state) == 'retained' and  manifestation.next_reservation.item == self
-        return true
-      else
-        false
+      manifestation.reserves.retained.each do |reserve|
+        if reserve.item == self
+          return true
+        end
       end
+      false
     end
 
     def lending_rule(user)

data/app/models/reserve.rb

@@ -2,7 +2,7 @@ class Reserve < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }
-  scope :waiting, -> {not_in_state(:completed, :expired).where('canceled_at IS NULL AND (expired_at > ? OR expired_at IS NULL)', Time.zone.now).order('reserves.id DESC')}
+  scope :waiting, -> {not_in_state(:completed, :expired, :retained).where('canceled_at IS NULL AND (expired_at > ? OR expired_at IS NULL)', Time.zone.now).order('reserves.id DESC')}
   scope :retained, -> {in_state(:retained).where('retained_at IS NOT NULL')}
   scope :completed, -> {in_state(:completed).where('checked_out_at IS NOT NULL')}
   scope :canceled, -> {in_state(:canceled).where('canceled_at IS NOT NULL')}

data/app/models/reserve_state_machine.rb

@@ -21,8 +21,10 @@ class ReserveStateMachine
     # TODO: 「取り置き中」の状態を正しく表す
     reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now})
     Reserve.transaction do
-      if reserve.item and reserve.next_reservation
-        reserve.item.reserves.waiting.readonly(false).map{|r|
+      if reserve.item
+        other_reserves = reserve.item.reserves.waiting
+        other_reserves += reserve.item.reserves.in_state(:retained)
+        other_reserves.each{|r|
           if r != reserve
             r.transition_to!(:postponed)
             r.item = nil

data/app/views/checked_items/new.html.erb

@@ -12,7 +12,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to @basket.user.username, @basket.user.profile -%></li>
+    <li><%= t('activerecord.attributes.user.username') %>: <%= link_to @basket.user.username, @basket.user.profile -%></li>
+    <li><%= t('activerecord.attributes.user.user_number') %>: <%= @basket.user.profile.user_number %></li>
   </ul>
   <ul>
     <%- @basket.user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>

data/app/views/checkouts/_index.html.erb

@@ -21,11 +21,11 @@
   <ul>
     <li>
       <%= link_to 'RSS', checkouts_path(format: :rss) -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), checkouts_path(format: :rss) -%>
     </li>
     <li>
       <%= link_to 'TSV', checkouts_path(format: :txt, locale: @locale.to_s) -%>
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, locale: @locale.to_s) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), checkouts_path(format: :txt, locale: @locale.to_s) -%>
     </li>
   </ul>
 </div>

data/app/views/checkouts/_index_item.html.erb

@@ -19,11 +19,11 @@
   <ul>
     <li>
       <%= link_to 'RSS', item_checkouts_path(item, format: :rss) -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), item_checkouts_path(item, format: :rss) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), item_checkouts_path(item, format: :rss) -%>
     </li>
     <li>
       <%= link_to 'TSV', item_checkouts_path(item, format: :txt, locale: @locale.to_s) -%>
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), item_checkouts_path(item, format: :txt, locale: @locale.to_s) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), item_checkouts_path(item, format: :txt, locale: @locale.to_s) -%>
     </li>
   </ul>
 </div>

data/app/views/checkouts/_index_overdue.html.erb

@@ -28,11 +28,11 @@
   <ul>
     <li>
       <%= link_to 'RSS', checkouts_path(format: :rss, days_overdue: 1) -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(format: :rss, days_overdue: 1) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), checkouts_path(format: :rss, days_overdue: 1) -%>
     </li>
     <li>
       <%= link_to 'TSV', checkouts_path(format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), checkouts_path(format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
     </li>
   </ul>
 </div>

data/app/views/checkouts/_index_user.html.erb

@@ -30,26 +30,26 @@
     <% if current_user.profile.checkout_icalendar_token? %>
       <li>
         <%= link_to 'iCalendar', checkouts_path(icalendar_token: user.profile.checkout_icalendar_token, format: :ics) -%>
-        <%= link_to (image_tag 'icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(user_id: user.username, format: :ics) -%>
+        <%= link_to image_tag('icons/date.png', size: '16x16', class: 'enju_icon', alt: 'iCalendar'), checkouts_path(user_id: user.username, format: :ics) -%>
       </li>
     <% end %>
     <%- if params[:days_overdue].present? -%>
       <li>
         <%= link_to 'RSS', checkouts_path(user_id: user.username, format: :rss, days_overdue: 1) -%>
-        <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: user.username, format: :rss, days_overdue: 1) -%>
+        <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), checkouts_path(user_id: user.username, format: :rss, days_overdue: 1) -%>
       </li>
       <li>
         <%= link_to 'TSV', checkouts_path(user_id: user.username, format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
-        <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: user.username, format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
+        <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), checkouts_path(user_id: user.username, format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
       </li>
     <%- else -%>
       <li>
         <%= link_to 'RSS', checkouts_path(user_id: user.username, format: :rss) -%>
-        <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: user.username, format: :rss) -%>
+        <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), checkouts_path(user_id: user.username, format: :rss) -%>
       </li>
       <li>
         <%= link_to 'TSV', checkouts_path(user_id: user.username, format: :txt, locale: @locale.to_s) -%>
-        <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: user.username, format: :txt, locale: @locale.to_s) -%>
+        <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), checkouts_path(user_id: user.username, format: :txt, locale: @locale.to_s) -%>
       </li>
     <%- end -%>
   </ul>

data/app/views/checkouts/index.txt.erb

@@ -1,4 +1,4 @@
-<%- if params[:days_overdue].present? -%><%= 'Overdue items' -%><%- else -%><%= 'Checkout items' -%><%- end -%> (created_at: <%= Time.now -%>)<%= "\n" -%>
+username	item_identifier	title	checked_out_at	due_date	<%- if params[:days_overdue].present? -%><%= 'Overdue items' -%><%- else -%><%= 'Checkout items' -%><%- end -%> (created_at: <%= Time.now -%>)<%= "\n" -%>
 <%- @checkouts.each do |checkout| -%>
 "<%=h checkout.user.try(:username) -%>"	"<%=h checkout.item.item_identifier -%>"	"<%=h checkout.item.manifestation.original_title -%>"	"<%=h checkout.created_at -%>"	"<%= checkout.due_date -%>"<%= "\n" -%>
 <%- end -%>

data/app/views/lending_policies/index.html.erb

@@ -26,8 +26,8 @@
     <td><%= lending_policy.fine -%></td>
     <td>
       <%= link_to t('page.show'), lending_policy -%>
-      <%= link_to t('page.edit'), edit_lending_policy_path(lending_policy) -%>
-      <%= link_to t('page.destroy'), lending_policy, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+      <%= link_to t('page.edit'), edit_lending_policy_path(lending_policy) if policy(lending_policy).update?-%>
+      <%= link_to t('page.destroy'), lending_policy, data: {confirm: t('page.are_you_sure')}, method: :delete if policy(lending_policy).destroy? -%>
     </td>
   </tr>
 <%- end -%>

data/app/views/profiles/_checkout_list.html.erb

@@ -1,8 +1,8 @@
 <h2>
   <%= t('activerecord.models.checkout') %>
-  <%= link_to image_tag('icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(icalendar_token: current_user.profile.checkout_icalendar_token, format: :ics) if current_user.profile.checkout_icalendar_token? %>
-  <%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: current_user.username, format: :rss) %>
-  <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: current_user.username, format: :txt) %>
+  <%= link_to image_tag('icons/date.png', size: '16x16', class: 'enju_icon', alt: 'iCalendar'), checkouts_path(icalendar_token: current_user.profile.checkout_icalendar_token, format: :ics) if current_user.profile.checkout_icalendar_token? %>
+  <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), checkouts_path(user_id: current_user.username, format: :rss) %>
+  <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), checkouts_path(user_id: current_user.username, format: :txt) %>
 </h2>
 <% if profile.user %>
   <%= render 'checkouts/list', checkouts: profile.user.checkouts.order('created_at DESC').page(params[:page]) %>

data/app/views/reserves/_title.html.erb

@@ -17,6 +17,6 @@
     <%- if reserve.manifestation.access_address? -%>
       <br />
       <%= link_to reserve.manifestation.access_address, reserve.manifestation.access_address -%>
-      <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: 'Web'), reserve.manifestation.access_address -%>
+      <%= link_to image_tag('icons/world_go.png', size: '16x16', class: 'enju_icon', alt: 'Web'), reserve.manifestation.access_address -%>
     <%- end -%>
 <% end %>

data/app/views/reserves/index.html.erb

@@ -103,14 +103,14 @@
 
   <p>
     <%- if @user -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), reserves_path(user_id: @user.username, format: :rss) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), reserves_path(user_id: @user.username, format: :rss) -%>
       (<%= link_to 'RSS', reserves_path(user_id: @user.username, format: :rss) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>
       (<%= link_to 'TSV', reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>)
     <%- else -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), reserves_path(format: :rss) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), reserves_path(format: :rss) -%>
       (<%= link_to 'RSS', reserves_path(format: :rss) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), reserves_path(format: :txt, locale: @locale.to_s) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), reserves_path(format: :txt, locale: @locale.to_s) -%>
       (<%= link_to 'TSV', reserves_path(format: :txt, locale: @locale.to_s) -%>)
     <%- end -%>
   </p>

data/db/migrate/032_create_checkins.rb

@@ -1,14 +1,11 @@
 class CreateCheckins < ActiveRecord::Migration
   def self.up
     create_table :checkins do |t|
-      t.integer :item_id, :null => false
-      t.integer :librarian_id
-      t.integer :basket_id
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :librarian, index: true
+      t.references :basket, index: true
       t.timestamps
     end
-    add_index :checkins, :item_id
-    add_index :checkins, :librarian_id
-    add_index :checkins, :basket_id
   end
 
   def self.down

data/db/migrate/033_create_checkouts.rb

@@ -1,22 +1,17 @@
 class CreateCheckouts < ActiveRecord::Migration
   def self.up
     create_table :checkouts do |t|
-      t.integer :user_id
-      t.integer :item_id, :null => false
-      t.integer :checkin_id
-      t.integer :librarian_id
-      t.integer :basket_id
+      t.references :user, index: true, foreign_key: true
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :checkin, index: true, foreign_key: true
+      t.references :librarian, index: true
+      t.references :basket, index: true
       t.datetime :due_date
-      t.integer :checkout_renewal_count, :default => 0, :null => false
-      t.integer :lock_version, :default => 0, :null => false
+      t.integer :checkout_renewal_count, default: 0, null: false
+      t.integer :lock_version, default: 0, null: false
       t.timestamps
     end
-    add_index :checkouts, :user_id
-    add_index :checkouts, :item_id
-    add_index :checkouts, :basket_id
-    add_index :checkouts, [:item_id, :basket_id], :unique => true
-    add_index :checkouts, :librarian_id
-    add_index :checkouts, :checkin_id
+    add_index :checkouts, [:item_id, :basket_id], unique: true
   end
 
   def self.down

data/db/migrate/035_create_reserves.rb

@@ -1,23 +1,18 @@
 class CreateReserves < ActiveRecord::Migration
   def self.up
     create_table :reserves do |t|
-      t.integer :user_id, :null => false
-      t.integer :manifestation_id, :null => false
-      t.integer :item_id
-      t.integer :request_status_type_id, :null => false
+      t.references :user, index: true, foreign_key: true, null: false
+      t.references :manifestation, index: true, null: false
+      t.references :item, index: true
+      t.references :request_status_type, null: false
       t.datetime :checked_out_at
       t.timestamps
       t.datetime :canceled_at
       t.datetime :expired_at
       t.datetime :deleted_at
-      t.boolean :expiration_notice_to_patron, :default => false
-      t.boolean :expiration_notice_to_library, :default => false
+      t.boolean :expiration_notice_to_patron, default: false
+      t.boolean :expiration_notice_to_library, default: false
     end
-
-    add_index :reserves, :user_id
-    add_index :reserves, :manifestation_id
-    add_index :reserves, :item_id
-    add_index :reserves, :request_status_type_id
   end
 
   def self.down

data/db/migrate/121_create_checked_items.rb

@@ -1,14 +1,13 @@
 class CreateCheckedItems < ActiveRecord::Migration
   def self.up
     create_table :checked_items do |t|
-      t.integer :item_id, :null => false
-      t.integer :basket_id, :null => false
-      t.datetime :due_date, :null => false
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :basket, index: true, foreign_key: true, null: false
+      t.references :librarian, index: true
+      t.datetime :due_date, null: false
 
       t.timestamps
     end
-    add_index :checked_items, :item_id
-    add_index :checked_items, :basket_id
   end
 
   def self.down

data/db/migrate/127_create_use_restrictions.rb

@@ -1,7 +1,7 @@
 class CreateUseRestrictions < ActiveRecord::Migration
   def self.up
     create_table :use_restrictions do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/129_create_item_has_use_restrictions.rb

@@ -1,13 +1,11 @@
 class CreateItemHasUseRestrictions < ActiveRecord::Migration
   def self.up
     create_table :item_has_use_restrictions do |t|
-      t.integer :item_id, :null => false
-      t.integer :use_restriction_id, :null => false
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :use_restriction, index: true, foreign_key: true, null: false
 
       t.timestamps
     end
-    add_index :item_has_use_restrictions, :item_id
-    add_index :item_has_use_restrictions, :use_restriction_id
   end
 
   def self.down

data/db/migrate/132_create_circulation_statuses.rb

@@ -1,7 +1,7 @@
 class CreateCirculationStatuses < ActiveRecord::Migration
   def self.up
     create_table :circulation_statuses do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/20081030023518_create_user_group_has_checkout_types.rb

@@ -1,22 +1,20 @@
 class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration
   def self.up
     create_table :user_group_has_checkout_types do |t|
-      t.integer :user_group_id, :null => false
-      t.integer :checkout_type_id, :null => false
-      t.integer :checkout_limit, :default => 0, :null => false
-      t.integer :checkout_period, :default => 0, :null => false
-      t.integer :checkout_renewal_limit, :default => 0, :null => false
-      t.integer :reservation_limit, :default => 0, :null => false
-      t.integer :reservation_expired_period, :default => 7, :null => false
-      t.boolean :set_due_date_before_closing_day, :default => false, :null => false
+      t.references :user_group, index: true, foreign_key: true, null: false
+      t.references :checkout_type, index: true, foreign_key: true, null: false
+      t.integer :checkout_limit, default: 0, null: false
+      t.integer :checkout_period, default: 0, null: false
+      t.integer :checkout_renewal_limit, default: 0, null: false
+      t.integer :reservation_limit, default: 0, null: false
+      t.integer :reservation_expired_period, default: 7, null: false
+      t.boolean :set_due_date_before_closing_day, default: false, null: false
       t.datetime :fixed_due_date
       t.text :note
       t.integer :position
 
       t.timestamps
     end
-    add_index :user_group_has_checkout_types, :user_group_id
-    add_index :user_group_has_checkout_types, :checkout_type_id
   end
 
   def self.down