enju_circulation 0.3.11 → 0.4.0.beta.1

data/db/migrate/20190629134017_rename_user_group_has_checkout_type_due_date_before_to_due_date_after.rb

@@ -0,0 +1,5 @@
+class RenameUserGroupHasCheckoutTypeDueDateBeforeToDueDateAfter < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :user_group_has_checkout_types, :set_due_date_before_closing_day, :set_due_date_after_closing_day
+  end
+end

data/db/migrate/20190706052525_add_display_name_translations_to_circulation_status.rb

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToCirculationStatus < ActiveRecord::Migration[5.2]
+  def change
+    add_column :circulation_statuses, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/db/migrate/20190713114724_add_checkout_id_to_checkin.rb

@@ -0,0 +1,5 @@
+class AddCheckoutIdToCheckin < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :checkins, :checkin, foreign_key: true
+  end
+end

data/db/migrate/20190814120827_add_display_name_translations_to_checkout_type.rb

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToCheckoutType < ActiveRecord::Migration[5.2]
+  def change
+    add_column :checkout_types, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.3.11".freeze
+  VERSION = "0.4.0.beta.1"
 end

data/lib/generators/enju_circulation/setup/templates/db/fixtures/checkout_types.yml

@@ -3,20 +3,18 @@
 checkout_type_00001:
   id: 1
   name: book
-  display_name: "en: Book\r\n\
-    ja: 図書"
+  display_name_translations: {"en": "Book", "ja": "図書"}
   note: 
   position: 1
 checkout_type_00002:
   id: 2
   name: serial
-  display_name: "en: Serial\r\n\
-    ja: 定期刊行物"
+  display_name_translations: {"en": "Serial", "ja": "定期刊行物"}
   note: 
   position: 2
 checkout_type_00003:
   id: 3
   name: cd
-  display_name: CD
+  display_name_translations: {"en": "CD", "ja": "CD"}
   note: 
   position: 3

data/lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml

@@ -1,129 +1,97 @@
 --- 
 circulation_status_00001: 
   name: Available For Pickup  
-  display_name: |-
-    en: Available For Pickup
-    ja: 持ち出し可能
+  display_name_translations: {"en": "Available For Pickup", "ja": "持ち出し可能"}
   id: 1
   note: ""
   position: 1
 circulation_status_00002: 
   name: Available On Shelf  
-  display_name: |-
-    en: Available On Shelf
-    ja: 在架（利用可能）
+  display_name_translations: {"en": "Available on Shelf", "ja": "在架（利用可能）"}
   id: 2
   note: ""
   position: 2
 circulation_status_00003: 
   name: Circulation Status Undefined  
-  display_name: |-
-    en: Circulation Status Undefined
-    ja: 貸出状態未定義
+  display_name_translations: {"en": "Circulation Status Undefined", "ja": "貸出状態未定義"}
   id: 3
   note: ""
   position: 3
 circulation_status_00004: 
   name: Claimed Returned Or Never Borrowed  
-  display_name: |-
-    en: Claimed Returned Or Never Borrowed
-    ja: 利用者が返却済み、または未貸出と主張
+  display_name_translations: {"en": "Claimed Returned Or Never Borrowed", "ja": "利用者が返却済み、または未貸出と主張"}
   id: 4
   note: ""
   position: 4
 circulation_status_00005: 
   name: In Process  
-  display_name: |-
-    en: In Process
-    ja: 作業中
+  display_name_translations: {"en": "In Process", "ja": "作業中"}
   id: 5
   note: ""
   position: 5
 circulation_status_00006: 
   name: In Transit Between Library Locations  
-  display_name: |-
-    en: In Transit Between Library Locations
-    ja: 移動中
+  display_name_translations: {"en": "In Transit Between Library Locations", "ja": "移動中"}
   id: 6
   note: ""
   position: 6
 circulation_status_00007: 
   name: Lost  
-  display_name: |-
-    en: Lost
-    ja: 紛失
+  display_name_translations: {"en": "Lost", "ja": "紛失"}
   id: 7
   note: ""
   position: 7
 circulation_status_00008: 
   name: Missing  
-  display_name: |-
-    en: Missing
-    ja: 行方不明
+  display_name_translations: {"en": "Missing", "ja": "行方不明"}
   id: 8
   note: ""
   position: 8
 circulation_status_00009: 
   name: Not Available  
-  display_name: |-
-    en: Not Available
-    ja: 利用不可
+  display_name_translations: {"en": "Not Available", "ja": "利用不可"}
   id: 9
   note: ""
   position: 9
 circulation_status_00010: 
   name: On Loan  
-  display_name: |-
-    en: On Loan
-    ja: 貸出中
+  display_name_translations: {"en": "On Loan", "ja": "貸出中"}
   id: 10
   note: ""
   position: 10
 circulation_status_00011: 
   name: On Order  
-  display_name: |-
-    en: On Order
-    ja: 発注中
+  display_name_translations: {"en": "On Order", "ja": "発注中"}
   id: 11
   note: ""
   position: 11
 circulation_status_00012: 
   name: Pending Transfer  
-  display_name: |-
-    en: Pending Transfer
-    ja: 移動予定
+  display_name_translations: {"en": "Pending Transfer", "ja": "移動予定"}
   id: 12
   note: ""
   position: 12
 circulation_status_00013: 
   name: Recalled  
-  display_name: |-
-    en: Recalled
-    ja: 返却依頼中
+  display_name_translations: {"en": "Recalled",  "ja": "返却依頼中"}
   id: 13
   note: ""
   position: 13
 circulation_status_00014: 
   name: Waiting To Be Reshelved  
-  display_name: |-
-    en: Waiting To Be Reshelved
-    ja: 再配架待ち
+  display_name_translations: {"en": "Waiting To Be Reshelved", "ja": "再配架待ち"}
   id: 14
   note: ""
   position: 14
 circulation_status_00015: 
   name: Not arrived
-  display_name: |-
-    en: Not arrived
-    ja: 未着
+  display_name_translations: {"en": "Not arrived", "ja": "未着"}
   id: 15
   note: ""
   position: 15
 circulation_status_00016: 
   name: Removed
-  display_name: |-
-    en: Removed
-    ja: 除籍済み
+  display_name_translations: {"en": "Removed", "ja": "除籍済み"}
   id: 16
   note: ""
   position: 16

data/lib/tasks/enju_circulation_tasks.rake

@@ -74,8 +74,14 @@ namespace :enju_circulation do
             c.user.try(:profile).try(:full_name),
             c.user.try(:profile).try(:user_number),
           ].join("\t")
-	end
+        end
       end
     end
   end
+
+  desc "upgrade enju_circulation to enju_leaf 2.0"
+  task upgrade_20: :environment do
+    sql = 'UPDATE checkins SET checkout_id = checkouts.id FROM checkouts WHERE checkouts.checkin_id = checkins.id;'
+    ActiveRecord::Base.connection.execute(sql)
+  end
 end

data/spec/concerns/enju_accept_spec.rb

@@ -1,32 +1,32 @@
 require 'rails_helper'
 
+class MyAccept < Accept
+  include EnjuCirculation::EnjuAccept
+end
+
 describe EnjuCirculation::EnjuAccept do
   fixtures :all
 
   it "should successfully accept" do
-    accept = Accept.new(FactoryBot.attributes_for(:accept))
-    accept.item = FactoryBot.create(:item)
+    accept = MyAccept.new(FactoryBot.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
-    Item.reindex
-
     3.times do
-      FactoryBot.create(:item, circulation_status: CirculationStatus.find_by(name: 'In Process'))
+      FactoryBot.create(:item)
     end
-
-    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 = Accept.new(FactoryBot.attributes_for(:accept))
-    accept.item = FactoryBot.create(:item)
+    result = Item.count
+    inprocess_count = Item.where(circulation_status: CirculationStatus.find_by(name: "In Process")).count
+    onshelf_count = Item.where(circulation_status: CirculationStatus.find_by(name: "Available On Shelf")).count
+    accept = MyAccept.new(FactoryBot.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
+    expect(Item.where(circulation_status: CirculationStatus.find_by(name: "In Process")).count).to eq inprocess_count
+    expect(Item.where(circulation_status: CirculationStatus.find_by(name: "Available On Shelf")).count).to eq onshelf_count + 1
   end
 end

data/spec/controllers/accepts_controller_spec.rb

@@ -0,0 +1,294 @@
+require 'rails_helper'
+
+describe AcceptsController do
+  fixtures :all
+
+  def mock_user(stubs = {})
+    (@mock_user ||= mock_model(Accept).as_null_object).tap do |user|
+      user.stub(stubs) unless stubs.empty?
+    end
+  end
+
+  describe 'GET index' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns all accepts as @accepts' do
+        get :index
+        assigns(:accepts).should_not be_nil
+        response.should be_successful
+      end
+
+      describe 'When basket_id is specified' do
+        it 'assigns all accepts as @accepts' do
+          get :index, params: { basket_id: baskets(:basket_00010).id }
+          assigns(:accepts).should eq baskets(:basket_00010).accepts.order('accepts.created_at DESC').page(1)
+          response.should be_successful
+        end
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns all accepts as @accepts' do
+        get :index
+        assigns(:accepts).should_not be_nil
+        response.should be_successful
+      end
+
+      describe 'When basket_id is specified' do
+        it 'assigns all accepts as @accepts' do
+          get :index, params: { basket_id: baskets(:basket_00009).id }
+          assigns(:accepts).should eq baskets(:basket_00009).accepts.order('accepts.created_at DESC').page(1)
+          response.should be_successful
+        end
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'should not assign all accepts as @accepts' do
+        get :index
+        assigns(:accepts).should be_nil
+        response.should be_forbidden
+      end
+    end
+  end
+
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns the requested accept as @accept' do
+        accept = FactoryBot.create(:accept)
+        get :show, params: { id: accept.id }
+        assigns(:accept).should eq(accept)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns the requested accept as @accept' do
+        accept = FactoryBot.create(:accept)
+        get :show, params: { id: accept.id }
+        assigns(:accept).should eq(accept)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'assigns the requested accept as @accept' do
+        accept = FactoryBot.create(:accept)
+        get :show, params: { id: accept.id }
+        assigns(:accept).should eq(accept)
+        response.should be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'assigns the requested accept as @accept' do
+        accept = FactoryBot.create(:accept)
+        get :show, params: { id: accept.id }
+        assigns(:accept).should eq(accept)
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe 'GET new' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'assigns the requested accept as @accept' do
+        get :new
+        assigns(:accept).should_not be_valid
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'assigns the requested accept as @accept' do
+        get :new
+        assigns(:accept).should_not be_valid
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'should not assign the requested accept as @accept' do
+        get :new
+        assigns(:accept).should be_nil
+        response.should be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should not assign the requested accept as @accept' do
+        get :new
+        assigns(:accept).should be_nil
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe 'POST create' do
+    before(:each) do
+      @attrs = { item_identifier: '00003' }
+      @invalid_attrs = { item_identifier: 'invalid' }
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, params: { accept: @attrs }
+          assigns(:accept).should be_nil
+        end
+
+        it 'should not create a new accept without basket_id' do
+          post :create, params: { accept: @attrs }
+          response.should be_forbidden
+        end
+
+        describe 'When basket_id is specified' do
+          it 'redirects to the created accept' do
+            post :create, params: { accept: @attrs, basket_id: baskets(:basket_00009).id }
+            response.should redirect_to(accepts_url(basket_id: assigns(:accept).basket.id))
+            assigns(:accept).item.circulation_status.name.should eq 'Available On Shelf'
+          end
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved accept as @accept' do
+          post :create, params: { accept: @invalid_attrs }
+          assigns(:accept).should be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { accept: @invalid_attrs }
+          response.should be_forbidden
+        end
+      end
+
+      it 'should not create accept without item_id' do
+        post :create, params: { accept: { item_identifier: nil }, basket_id: baskets(:basket_00009).id }
+        assigns(:accept).should_not be_valid
+        response.should be_successful
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, params: { accept: @attrs }
+          assigns(:accept).should be_nil
+        end
+
+        it 'should not create a new accept without basket_id' do
+          post :create, params: { accept: @attrs }
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, params: { accept: @attrs }
+          assigns(:accept).should be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { accept: @attrs }
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe 'When not logged in' do
+      before(:each) do
+        @attrs = { item_identifier: '00003' }
+        @invalid_attrs = { item_identifier: 'invalid' }
+      end
+
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, params: { accept: @attrs }
+        end
+
+        it 'should redirect to new session url' do
+          post :create, params: { accept: @attrs }
+          response.should redirect_to new_user_session_url
+        end
+      end
+    end
+  end
+
+  describe 'DELETE destroy' do
+    before(:each) do
+      @accept = FactoryBot.create(:accept)
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'destroys the requested accept' do
+        delete :destroy, params: { id: @accept.id }
+      end
+
+      it 'redirects to the accepts list' do
+        delete :destroy, params: { id: @accept.id }
+        response.should redirect_to(accepts_url)
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'destroys the requested accept' do
+        delete :destroy, params: { id: @accept.id }
+      end
+
+      it 'redirects to the accepts list' do
+        delete :destroy, params: { id: @accept.id }
+        response.should redirect_to(accepts_url)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'destroys the requested accept' do
+        delete :destroy, params: { id: @accept.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { id: @accept.id }
+        response.should be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'destroys the requested accept' do
+        delete :destroy, params: { id: @accept.id }
+      end
+
+      it 'should be forbidden' do
+        delete :destroy, params: { id: @accept.id }
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end