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

data/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb

@@ -1,15 +1,14 @@
 class CreateCarrierTypeHasCheckoutTypes < ActiveRecord::Migration
   def self.up
     create_table :carrier_type_has_checkout_types do |t|
-      t.integer :carrier_type_id, :null => false
-      t.integer :checkout_type_id, :null => false
+      t.references :carrier_type, index: false, foreign_key: true, null: false
+      t.references :checkout_type, index: true, foreign_key: true, null: false
       t.text :note
       t.integer :position
 
       t.timestamps
     end
-    add_index :carrier_type_has_checkout_types, :carrier_type_id, :name => 'index_carrier_type_has_checkout_types_on_m_form_id'
-    add_index :carrier_type_has_checkout_types, :checkout_type_id
+    add_index :carrier_type_has_checkout_types, :carrier_type_id, name: 'index_carrier_type_has_checkout_types_on_m_form_id'
   end
 
   def self.down

data/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb

@@ -1,14 +1,14 @@
 class CreateCheckoutStatHasManifestations < ActiveRecord::Migration
   def self.up
     create_table :checkout_stat_has_manifestations do |t|
-      t.integer :manifestation_checkout_stat_id, :null => false
-      t.integer :manifestation_id, :null => false
+      t.references :manifestation_checkout_stat, index: false, null: false
+      t.references :manifestation, index: false, foreign_key: true, null: false
       t.integer :checkouts_count
 
       t.timestamps
     end
-    add_index :checkout_stat_has_manifestations, :manifestation_checkout_stat_id, :name => 'index_checkout_stat_has_manifestations_on_checkout_stat_id'
-    add_index :checkout_stat_has_manifestations, :manifestation_id, :name => 'index_checkout_stat_has_manifestations_on_manifestation_id'
+    add_index :checkout_stat_has_manifestations, :manifestation_checkout_stat_id, name: 'index_checkout_stat_has_manifestations_on_checkout_stat_id'
+    add_index :checkout_stat_has_manifestations, :manifestation_id, name: 'index_checkout_stat_has_manifestations_on_manifestation_id'
   end
 
   def self.down

data/db/migrate/20081215094955_create_checkout_stat_has_users.rb

@@ -1,14 +1,12 @@
 class CreateCheckoutStatHasUsers < ActiveRecord::Migration
   def self.up
     create_table :checkout_stat_has_users do |t|
-      t.integer :user_checkout_stat_id, :null => false
-      t.integer :user_id, :null => false
-      t.integer :checkouts_count, :default => 0, :null => false
+      t.references :user_checkout_stat, index: true, foreign_key: true, null: false
+      t.references :user, index: true, foreign_key: true, null: false
+      t.integer :checkouts_count, default: 0, null: false
 
       t.timestamps
     end
-    add_index :checkout_stat_has_users, :user_checkout_stat_id
-    add_index :checkout_stat_has_users, :user_id
   end
 
   def self.down

data/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb

@@ -1,13 +1,13 @@
 class CreateReserveStatHasManifestations < ActiveRecord::Migration
   def self.up
     create_table :reserve_stat_has_manifestations do |t|
-      t.integer :manifestation_reserve_stat_id, :null => false
-      t.integer :manifestation_id, :null => false
+      t.references :manifestation_reserve_stat, index: false, null: false
+      t.references :manifestation, index: false, foreign_key: true, null: false
       t.integer :reserves_count
 
       t.timestamps
     end
-    add_index :reserve_stat_has_manifestations, :manifestation_reserve_stat_id, :name => 'index_reserve_stat_has_manifestations_on_m_reserve_stat_id'
+    add_index :reserve_stat_has_manifestations, :manifestation_reserve_stat_id, name: 'index_reserve_stat_has_manifestations_on_m_reserve_stat_id'
     add_index :reserve_stat_has_manifestations, :manifestation_id
   end
 

data/db/migrate/20081220034117_create_reserve_stat_has_users.rb

@@ -1,14 +1,12 @@
 class CreateReserveStatHasUsers < ActiveRecord::Migration
   def self.up
     create_table :reserve_stat_has_users do |t|
-      t.integer :user_reserve_stat_id, :null => false
-      t.integer :user_id, :null => false
+      t.references :user_reserve_stat, index: true, foreign_key: true, null: false
+      t.references :user, index: true, foreign_key: true, null: false
       t.integer :reserves_count
 
       t.timestamps
     end
-    add_index :reserve_stat_has_users, :user_reserve_stat_id
-    add_index :reserve_stat_has_users, :user_id
   end
 
   def self.down

data/db/migrate/20090831220301_create_lending_policies.rb

@@ -1,12 +1,12 @@
 class CreateLendingPolicies < ActiveRecord::Migration
   def self.up
     create_table :lending_policies do |t|
-      t.integer :item_id, :null => false
-      t.integer :user_group_id, :null => false
-      t.integer :loan_period, :default => 0, :null => false
+      t.references :item, index: false, foreign_key: true, null: false
+      t.references :user_group, index: false, foreign_key: true, null: false
+      t.integer :loan_period, default: 0, null: false
       t.datetime :fixed_due_date
-      t.integer :renewal, :default => 0, :null => false
-      t.integer :fine, :default => 0, :null => false
+      t.integer :renewal, default: 0, null: false
+      t.integer :fine, default: 0, null: false
       t.text :note
       t.integer :position
 

data/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb

@@ -1,5 +1,5 @@
 class AddLibrarianIdToCheckedItem < ActiveRecord::Migration
   def change
-    add_column :checked_items, :librarian_id, :integer
+    add_reference :checked_items, :user, index: true, foreign_key: true, column_name: :librarian_id
   end
 end

data/db/migrate/20130416054135_add_circulation_status_id_to_item.rb

@@ -1,7 +1,7 @@
 class AddCirculationStatusIdToItem < ActiveRecord::Migration
   def change
-    add_column :items, :circulation_status_id, :integer, :default => 5, :null => false
-    add_column :items, :checkout_type_id, :integer, :default => 1, :null => false
+    add_column :items, :circulation_status_id, :integer, default: 5, null: false
+    add_column :items, :checkout_type_id, :integer, default: 1, null: false
     add_index :items, :circulation_status_id
     add_index :items, :checkout_type_id
   end

data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb

@@ -1,12 +1,8 @@
 class AddUserIdToUserCheckoutStat < ActiveRecord::Migration
   def change
-    add_column :user_checkout_stats, :user_id, :integer
-    add_column :user_reserve_stats, :user_id, :integer
-    add_column :manifestation_checkout_stats, :user_id, :integer
-    add_column :manifestation_reserve_stats, :user_id, :integer
-    add_index :user_checkout_stats, :user_id
-    add_index :user_reserve_stats, :user_id
-    add_index :manifestation_checkout_stats, :user_id
-    add_index :manifestation_reserve_stats, :user_id
+    add_reference :user_checkout_stats, :user, index: true, foreign_key: true
+    add_reference :user_reserve_stats, :user, index: true, foreign_key: true
+    add_reference :manifestation_checkout_stats, :user, index: true, foreign_key: true
+    add_reference :manifestation_reserve_stats, :user, index: true, foreign_key: true
   end
 end

data/db/migrate/20141014065831_add_shelf_id_to_checkout.rb

@@ -1,6 +1,5 @@
 class AddShelfIdToCheckout < ActiveRecord::Migration
   def change
-    add_column :checkouts, :shelf_id, :integer
-    add_index :checkouts, :shelf_id
+    add_reference :checkouts, :shelf, index: true, foreign_key: true
   end
 end

data/db/migrate/20141020120523_add_library_id_to_checkout.rb

@@ -1,6 +1,5 @@
 class AddLibraryIdToCheckout < ActiveRecord::Migration
   def change
-    add_column :checkouts, :library_id, :integer
-    add_index :checkouts, :library_id
+    add_reference :checkouts, :library, index: true, foreign_key: true
   end
 end

data/db/migrate/20150106001709_create_demands.rb

@@ -1,14 +1,11 @@
 class CreateDemands < ActiveRecord::Migration
   def change
     create_table :demands do |t|
-      t.integer :user_id
-      t.integer :item_id
-      t.integer :message_id
+      t.references :user, index: true, foreign_key: true
+      t.references :item, index: true, foreign_key: true
+      t.references :message, index: true, foreign_key: true
 
       t.timestamps null: false
     end
-    add_index :demands, :user_id
-    add_index :demands, :item_id
-    add_index :demands, :message_id
   end
 end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.2.0.beta.3"
+  VERSION = "0.2.0.beta.4"
 end

data/lib/generators/enju_circulation/setup/setup_generator.rb

@@ -5,11 +5,11 @@ class EnjuCirculation::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_circulation")
     return if file == 'fixture'
-    rake("enju_circulation_engine:install:migrations")
-    rake("enju_event_engine:install:migrations")
     rake("enju_message_engine:install:migrations")
-    generate("enju_event:setup")
+    rake("enju_event_engine:install:migrations")
+    rake("enju_circulation_engine:install:migrations")
     generate("enju_message:setup")
+    generate("enju_event:setup")
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       "  include EnjuCirculation::Controller\n"
     end

data/spec/concerns/enju_accept_spec.rb

@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+class MyAccept < Accept
+  include EnjuCirculation::EnjuAccept
+end
+
+describe EnjuCirculation::EnjuAccept do
+  fixtures :all
+  it "should successfully accept" do
+    accept = MyAccept.new(FactoryGirl.attributes_for(:accept))
+    expect(accept.item).to be_truthy
+    expect(accept.item.circulation_status.name).to eq "In Process"
+    accept.save!
+    expect(accept.item.circulation_status.name).to eq "Available On Shelf"
+    expect(accept.item.use_restriction.name).to eq "Limited Circulation, Normal Loan Period"
+  end
+  it "should reflect to items list", solr: true do
+    FactoryGirl.create(:item)
+    FactoryGirl.create(:item)
+    FactoryGirl.create(:item)
+    result = Item.search.build { facet :circulation_status }.execute
+    inprocess_count = result.facet(:circulation_status).rows.find{|e| e.value == "In Process" }.count
+    onshelf_count = result.facet(:circulation_status).rows.find{|e| e.value == "Available On Shelf" }.try(:count) || 0
+    accept = MyAccept.new(FactoryGirl.attributes_for(:accept))
+    accept.save!
+    result = Item.search.build { facet :circulation_status }.execute
+    expect(result.facet(:circulation_status).rows.find{|e| e.value == "In Process" }.count).to eq inprocess_count
+    expect(result.facet(:circulation_status).rows.find{|e| e.value == "Available On Shelf" }.try(:count)).to eq onshelf_count + 1
+  end
+end

data/spec/controllers/checkins_controller_spec.rb

@@ -249,7 +249,7 @@ describe CheckinsController do
         it "should show notification when it is reserved" do
           post :create, :checkin => {:item_identifier => '00008'}, :basket_id => 9
           flash[:message].to_s.index(I18n.t('item.this_item_is_reserved')).should be_truthy
-          assigns(:checkin).item.manifestation.next_reservation.current_state.should eq 'retained'
+          assigns(:checkin).item.should be_retained
           assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
           response.should redirect_to(checkins_url(basket_id: assigns(:basket).id))
         end

data/spec/controllers/checkouts_controller_spec.rb

@@ -38,12 +38,13 @@ describe CheckoutsController do
 
       it "should get index txt" do
         get :index, format: 'txt'
-        assigns(:checkouts).count.should eq Checkout.count
+        assigns(:checkouts).count.should eq assigns(:checkouts).total_entries
         response.should be_success
       end
 
       it "should get index rss" do
         get :index, format: 'rss'
+        assigns(:checkouts).count.should eq assigns(:checkouts).total_entries
         response.should be_success
       end
 

data/spec/controllers/reserves_controller_spec.rb

@@ -32,25 +32,27 @@ describe ReservesController do
       end
 
       it "should get index feed without user_id" do
-        get :index, :format => 'rss'
+        get :index, format: 'rss'
         response.should be_success
-        assigns(:reserves).collect(&:id).should eq Reserve.order('reserves.id DESC').includes(:manifestation).page(1).collect(&:id)
+        assigns(:reserves).count.should eq assigns(:reserves).total_entries
+        assigns(:reserves).should eq(Reserve.order('reserves.id DESC').includes(:manifestation))
       end
 
       it "should get index txt without user_id" do
-        get :index, :format => 'txt'
+        get :index, format: 'txt'
         response.should be_success
+        assigns(:reserves).count.should eq assigns(:reserves).total_entries
         assigns(:reserves).should eq(Reserve.order('reserves.id DESC').includes(:manifestation))
       end
 
       it "should get index feed with user_id" do
-        get :index, :user_id => users(:user1).username, :format => 'rss'
+        get :index, :user_id => users(:user1).username, format: 'rss'
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
 
       it "should get index txt with user_id" do
-        get :index, :user_id => users(:user1).username, :format => 'txt'
+        get :index, :user_id => users(:user1).username, format: 'txt'
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation))
       end
@@ -62,7 +64,7 @@ describe ReservesController do
       end
 
       it "should get other user's index feed" do
-        get :index, :user_id => users(:user1).username, :format => :rss
+        get :index, :user_id => users(:user1).username, format: :rss
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
@@ -82,13 +84,13 @@ describe ReservesController do
       end
 
       it "should get my index feed" do
-        get :index, :format => :rss
+        get :index, format: :rss
         response.should be_success
         response.should render_template("index")
       end
 
       it "should get my index txt" do
-        get :index, :format => :txt
+        get :index, format: :txt
         response.should be_success
         response.should render_template("index")
       end
@@ -100,13 +102,13 @@ describe ReservesController do
         end
 
         it "should redirect to my reservation feed" do
-          get :index, :user_id => users(:user1).username, :format => 'rss'
-          response.should redirect_to reserves_url(:format => :rss)
+          get :index, :user_id => users(:user1).username, format: 'rss'
+          response.should redirect_to reserves_url(format: :rss)
         end
 
         it "should redirect to my reservation txt" do
-          get :index, :user_id => users(:user1).username, :format => 'txt'
-          response.should redirect_to reserves_url(:format => :txt)
+          get :index, :user_id => users(:user1).username, format: 'txt'
+          response.should redirect_to reserves_url(format: :txt)
         end
       end
 

data/spec/dummy/db/schema.rb

@@ -223,14 +223,17 @@ ActiveRecord::Schema.define(version: 20160814165332) do
   create_table "checked_items", force: :cascade do |t|
     t.integer  "item_id",      null: false
     t.integer  "basket_id",    null: false
+    t.integer  "librarian_id"
     t.datetime "due_date",     null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "librarian_id"
+    t.integer  "user_id"
   end
 
   add_index "checked_items", ["basket_id"], name: "index_checked_items_on_basket_id"
   add_index "checked_items", ["item_id"], name: "index_checked_items_on_item_id"
+  add_index "checked_items", ["librarian_id"], name: "index_checked_items_on_librarian_id"
+  add_index "checked_items", ["user_id"], name: "index_checked_items_on_user_id"
 
   create_table "checkins", force: :cascade do |t|
     t.integer  "item_id",                  null: false
@@ -1105,7 +1108,6 @@ ActiveRecord::Schema.define(version: 20160814165332) do
   add_index "reserves", ["item_id"], name: "index_reserves_on_item_id"
   add_index "reserves", ["manifestation_id"], name: "index_reserves_on_manifestation_id"
   add_index "reserves", ["pickup_location_id"], name: "index_reserves_on_pickup_location_id"
-  add_index "reserves", ["request_status_type_id"], name: "index_reserves_on_request_status_type_id"
   add_index "reserves", ["user_id"], name: "index_reserves_on_user_id"
 
   create_table "resource_export_file_transitions", force: :cascade do |t|

data/spec/factories/accept.rb

@@ -0,0 +1,21 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :accept do
+    basket_id{FactoryGirl.create(:basket).id}
+    item_id{FactoryGirl.create(:item).id}
+    librarian_id{FactoryGirl.create(:librarian).id}
+  end
+end
+
+# == Schema Information
+#
+# Table name: accepts
+#
+#  id           :integer          not null, primary key
+#  basket_id    :integer
+#  item_id      :integer
+#  librarian_id :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/factories/reserve.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :reserve do |f|
     before(:create) do |reserve|
       profile = FactoryGirl.create(:profile)
-      user = User.new(FactoryGirl.attributes_for(:user), as: :admin)
+      user = User.new(FactoryGirl.attributes_for(:user))
       user.profile = profile
       reserve.user = user
     end

data/spec/fixtures/reserve_transitions.yml

@@ -3,76 +3,91 @@ reserve_transition_00001:
   to_state: requested
   reserve_id: 1
   sort_key: 0
+  most_recent: true
 reserve_transition_00002:
   id: 2
   to_state: requested
   reserve_id: 2
   sort_key: 0
+  most_recent: true
 reserve_transition_00003:
   id: 3
   to_state: requested
   reserve_id: 3
   sort_key: 0
+  most_recent: true
 reserve_transition_00004:
   id: 4
   to_state: requested
   reserve_id: 4
   sort_key: 0
+  most_recent: true
 reserve_transition_00005:
   id: 5
   to_state: requested
   reserve_id: 5
   sort_key: 0
+  most_recent: true
 reserve_transition_00006:
   id: 6
   to_state: requested
   reserve_id: 6
   sort_key: 0
+  most_recent: true
 reserve_transition_00007:
   id: 7
   to_state: requested
   reserve_id: 7
   sort_key: 0
+  most_recent: true
 reserve_transition_00008:
   id: 8
   to_state: expired
   reserve_id: 8
   sort_key: 0
+  most_recent: true
 reserve_transition_00009:
   id: 9
   to_state: requested
   reserve_id: 9
   sort_key: 0
+  most_recent: true
 reserve_transition_00010:
   id: 10
   to_state: completed
   reserve_id: 10
   sort_key: 0
+  most_recent: true
 reserve_transition_00011:
   id: 11
   to_state: expired
   reserve_id: 11
   sort_key: 0
+  most_recent: true
 reserve_transition_00012:
   id: 12
   to_state: retained
   reserve_id: 12
   sort_key: 0
+  most_recent: true
 reserve_transition_00013:
   id: 13
   to_state: requested
   reserve_id: 13
   sort_key: 0
+  most_recent: true
 reserve_transition_00014:
   id: 14
   to_state: retained
   reserve_id: 14
   sort_key: 0
+  most_recent: true
 reserve_transition_00015:
   id: 15
   to_state: requested
   reserve_id: 15
   sort_key: 0
+  most_recent: true
 
 # == Schema Information
 #