enju_circulation 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ebe6b31ee4582069cb7065b429f5a6a54ce1eac81b5af60aa60d11cd774b08
-  data.tar.gz: 5efc3f26f9703fd0b3bdcf1304b4efaa25364a8effaaa29bb44de4ca0f6af8fd
+  metadata.gz: 8acae0635971690b1966d9ec8c5c3f5c608528c624feb76f201ce0cc90b473e4
+  data.tar.gz: 60815d7876aee8efe0aba781e33cc919c2ff5af9830761dc1aff778398522bea
 SHA512:
-  metadata.gz: c9156fbb9c9d3869ac1ff16d50c186198a8b7dc1db214b571fbc3df857e8f72f10aa3ad03b693efbf20930649aea90eeac58f93f90cce1b6dcaf85a2a0ed7690
-  data.tar.gz: 2c4523ae4c13ada69225b8173a160cfece61b879dd2c39ffedc70524666ef442eb44108ea362a2cf2865e4d2ce0ca80a6aec950996f0fc713042b549248f35a6
+  metadata.gz: ec55abc5f36563dbba595a2984564c1f8f45911acf3fc24fdcddba3c4f0b0b3d66981081638a4ff7d768122ba510196e49d2546af9b4522b928d39d9aad6b1fe
+  data.tar.gz: fc0727906cdea3789852dbee7c97684b600f4ca0b5aa143a8c75caff5c5f0f104a3ec6d284bb92c76a3d99121c974261341924a4d3450e94162c0dcde6fd5b9c

data/app/controllers/checkins_controller.rb

@@ -77,12 +77,12 @@ class CheckinsController < ApplicationController
         end
         flash[:message] << message if message
         format.html { redirect_to checkins_url(basket_id: @checkin.basket_id) }
-        format.json { render json: @checkin, status: :created, location: @checkin }
+        format.json { render json: {result: @checkin, messages: flash[:message]}, status: :created, location: @checkin }
         format.js { redirect_to checkins_url(basket_id: @basket.id, format: :js) }
       else
         @checkins = @basket.checkins.page(1)
         format.html { render action: "new" }
-        format.json { render json: @checkin.errors, status: :unprocessable_entity }
+        format.json { render json: {messages: @checkin.errors}, status: :unprocessable_entity }
         format.js { render action: "index" }
       end
     end

data/app/models/checkin.rb

@@ -91,5 +91,5 @@ end
 #  basket_id    :integer
 #  created_at   :datetime
 #  updated_at   :datetime
-#  lock_version :integer          default(0), not null
+#  lock_version :integer          default("0"), not null
 #

data/app/models/checkout.rb

@@ -174,8 +174,8 @@ end
 #  librarian_id           :integer
 #  basket_id              :integer
 #  due_date               :datetime
-#  checkout_renewal_count :integer          default(0), not null
-#  lock_version           :integer          default(0), not null
+#  checkout_renewal_count :integer          default("0"), not null
+#  lock_version           :integer          default("0"), not null
 #  created_at             :datetime
 #  updated_at             :datetime
 #  shelf_id               :integer

data/app/models/checkout_stat_has_user.rb

@@ -17,7 +17,7 @@ end
 #  id                    :integer          not null, primary key
 #  user_checkout_stat_id :integer          not null
 #  user_id               :integer          not null
-#  checkouts_count       :integer          default(0), not null
+#  checkouts_count       :integer          default("0"), not null
 #  created_at            :datetime
 #  updated_at            :datetime
 #

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

@@ -105,6 +105,8 @@ module EnjuCirculation
         manifestation.next_reservation.transition_to!(:completed)
         manifestation.reload
       end
+
+      reload
       update!(circulation_status: CirculationStatus.find_by(name: 'On Loan'))
     end
 

data/app/models/lending_policy.rb

@@ -19,10 +19,10 @@ end
 #  id             :integer          not null, primary key
 #  item_id        :integer          not null
 #  user_group_id  :integer          not null
-#  loan_period    :integer          default(0), not null
+#  loan_period    :integer          default("0"), not null
 #  fixed_due_date :datetime
-#  renewal        :integer          default(0), not null
-#  fine           :integer          default(0), not null
+#  renewal        :integer          default("0"), not null
+#  fine           :integer          default("0"), not null
 #  note           :text
 #  position       :integer
 #  created_at     :datetime

data/app/models/manifestation_checkout_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                             :integer          not null, primary key
 #  to_state                       :string
-#  metadata                       :text             default({})
+#  metadata                       :text             default("{}")
 #  sort_key                       :integer
 #  manifestation_checkout_stat_id :integer
 #  created_at                     :datetime

data/app/models/manifestation_reserve_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                            :integer          not null, primary key
 #  to_state                      :string
-#  metadata                      :text             default({})
+#  metadata                      :text             default("{}")
 #  sort_key                      :integer
 #  manifestation_reserve_stat_id :integer
 #  created_at                    :datetime

data/app/models/reserve.rb

@@ -2,7 +2,7 @@ class Reserve < ApplicationRecord
   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, :retained).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).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')}
@@ -404,10 +404,10 @@ end
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
-#  expiration_notice_to_patron  :boolean          default(FALSE)
-#  expiration_notice_to_library :boolean          default(FALSE)
+#  expiration_notice_to_patron  :boolean          default("0")
+#  expiration_notice_to_library :boolean          default("0")
 #  pickup_location_id           :integer
 #  retained_at                  :datetime
 #  postponed_at                 :datetime
-#  lock_version                 :integer          default(0), not null
+#  lock_version                 :integer          default("0"), not null
 #

data/app/models/reserve_state_machine.rb

@@ -14,16 +14,15 @@ class ReserveStateMachine
   transition from: :requested, to: [:retained, :canceled, :expired, :completed]
 
   after_transition(to: :requested) do |reserve|
-    reserve.update(request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil)
+    reserve.update(request_status_type: RequestStatusType.find_by(name: 'In Process'), item_id: nil, retained_at: nil)
   end
 
   after_transition(to: :retained) do |reserve|
     # TODO: 「取り置き中」の状態を正しく表す
-    reserve.update(request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now)
+    reserve.update(request_status_type: RequestStatusType.find_by(name: 'In Process'), retained_at: Time.zone.now)
     Reserve.transaction do
       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)

data/app/models/reserve_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id          :integer          not null, primary key
 #  to_state    :string
-#  metadata    :text             default({})
+#  metadata    :text             default("{}")
 #  sort_key    :integer
 #  reserve_id  :integer
 #  created_at  :datetime

data/app/models/user_checkout_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                    :integer          not null, primary key
 #  to_state              :string
-#  metadata              :text             default({})
+#  metadata              :text             default("{}")
 #  sort_key              :integer
 #  user_checkout_stat_id :integer
 #  created_at            :datetime

data/app/models/user_group_has_checkout_type.rb

@@ -71,12 +71,12 @@ end
 #  id                              :integer          not null, primary key
 #  user_group_id                   :integer          not null
 #  checkout_type_id                :integer          not null
-#  checkout_limit                  :integer          default(0), not null
-#  checkout_period                 :integer          default(0), not null
-#  checkout_renewal_limit          :integer          default(0), not null
-#  reservation_limit               :integer          default(0), not null
-#  reservation_expired_period      :integer          default(7), not null
-#  set_due_date_before_closing_day :boolean          default(FALSE), not null
+#  checkout_limit                  :integer          default("0"), not null
+#  checkout_period                 :integer          default("0"), not null
+#  checkout_renewal_limit          :integer          default("0"), not null
+#  reservation_limit               :integer          default("0"), not null
+#  reservation_expired_period      :integer          default("7"), not null
+#  set_due_date_before_closing_day :boolean          default("0"), not null
 #  fixed_due_date                  :datetime
 #  note                            :text
 #  position                        :integer

data/app/models/user_reserve_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                   :integer          not null, primary key
 #  to_state             :string
-#  metadata             :text             default({})
+#  metadata             :text             default("{}")
 #  sort_key             :integer
 #  user_reserve_stat_id :integer
 #  created_at           :datetime

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.3.8".freeze
+  VERSION = "0.3.9".freeze
 end

data/spec/controllers/checkins_controller_spec.rb

@@ -201,14 +201,14 @@ describe CheckinsController do
           it 'redirects to the created checkin' do
             post :create, params: { checkin: @attrs, basket_id: 9 }
             response.should redirect_to(checkins_url(basket_id: assigns(:checkin).basket_id))
-            assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
+            assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
           end
 
           it 'should checkin the overdue item' do
             post :create, params: { checkin: { item_identifier: '00014' }, basket_id: 9 }
             response.should redirect_to(checkins_url(basket_id: assigns(:checkin).basket_id))
             assigns(:checkin).checkout.should be_valid
-            assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
+            assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
           end
         end
       end
@@ -249,14 +249,14 @@ describe CheckinsController do
         it 'should show notification when it is reserved' do
           post :create, params: { 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.should be_retained
-          assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
+          assigns(:checkin).checkout.item.should be_retained
+          assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
           response.should redirect_to(checkins_url(basket_id: assigns(:basket).id))
         end
 
         it 'should show notification when an item includes supplements' do
           post :create, params: { checkin: { item_identifier: '00004' }, basket_id: 9 }
-          assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
+          assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
           flash[:message].to_s.index(I18n.t('item.this_item_include_supplement')).should be_truthy
           response.should redirect_to(checkins_url(basket_id: assigns(:basket).id))
         end
@@ -306,6 +306,128 @@ describe CheckinsController do
     end
   end
 
+  describe 'POST create (json format)' do
+    before(:each) do
+      @attrs = { item_identifier: '00003' }
+      @invalid_attrs = { item_identifier: 'invalid' }
+      request.env["HTTP_ACCEPT"] = 'application/json'
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      describe 'with valid params' do
+        it 'assigns a newly created checkin as @checkin' do
+          post :create, params: { checkin: @attrs }
+          assigns(:checkin).should be_nil
+        end
+
+        it 'should not create checkin without basket_id' do
+          post :create, params: { checkin: @attrs }
+          json = JSON.parse(response.body)
+          expect(json['error']).to eq('forbidden')
+        end
+
+        describe 'When basket_id is specified' do
+          it 'redirects to the created checkin' do
+            post :create, params: { checkin: @attrs, basket_id: 9 }
+            expect(response).to have_http_status(:created)
+            json = JSON.parse(response.body)
+            expect(json['result']['basket_id']).to eq(9)
+            assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
+          end
+
+          it 'should checkin the overdue item' do
+            post :create, params: { checkin: { item_identifier: '00014' }, basket_id: 9 }
+            expect(response).to have_http_status(:created)
+            assigns(:checkin).checkout.should be_valid
+            assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
+          end
+        end
+      end
+
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved checkin as @checkin' do
+          post :create, params: { checkin: @invalid_attrs }
+          assigns(:checkin).should be_nil
+        end
+
+        it 'should be forbidden' do
+          post :create, params: { checkin: @invalid_attrs }
+          json = JSON.parse(response.body)
+          expect(json['error']).to eq('forbidden')
+        end
+      end
+
+      it 'should not create checkin without item_id' do
+        post :create, params: { checkin: { item_identifier: nil }, basket_id: 9 }
+        assigns(:checkin).should_not be_valid
+        expect(response).to have_http_status(:unprocessable_entity)
+        json = JSON.parse(response.body)
+        expect(json['messages']['base']).to match_array([I18n.t('checkin.item_not_found')])
+        expect(json['messages']['item_id']).to match_array([I18n.t('errors.messages.blank')])
+      end
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      describe 'with valid params' do
+        it 'assigns a newly created checkin as @checkin' do
+          post :create, params: { checkin: @attrs }
+          assigns(:checkin).should be_nil
+        end
+
+        it 'should not create checkin without basket_id' do
+          post :create, params: { checkin: @attrs }
+          json = JSON.parse(response.body)
+          expect(json['error']).to eq('forbidden')
+        end
+
+        it 'should show notification when it is reserved' do
+          post :create, params: { checkin: { item_identifier: '00008' }, basket_id: 9 }
+          flash[:message].to_s.index(I18n.t('item.this_item_is_reserved')).should be_truthy
+          assigns(:checkin).checkout.item.should be_retained
+          assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
+          expect(response).to have_http_status(:created)
+        end
+
+        it 'should show notification when an item includes supplements' do
+          post :create, params: { checkin: { item_identifier: '00004' }, basket_id: 9 }
+          assigns(:checkin).checkout.item.circulation_status.name.should eq 'Available On Shelf'
+          flash[:message].to_s.index(I18n.t('item.this_item_include_supplement')).should be_truthy
+          expect(response).to have_http_status(:created)
+        end
+      end
+
+      it "should show notice when other library's item is checked in" do
+        sign_in users(:librarian2)
+        post :create, params: { checkin: { item_identifier: '00009' }, basket_id: 9 }
+        assigns(:checkin).should be_valid
+        flash[:message].to_s.index(I18n.t('checkin.other_library_item')).should be_truthy
+        expect(response).to have_http_status(:created)
+      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 checkin as @checkin' do
+          post :create, params: { checkin: @attrs }
+        end
+
+        it 'should redirect to new session url' do
+          post :create, params: { checkin: @attrs }
+          expect(response).to have_http_status(:ok)
+        end
+      end
+    end
+  end
+
   describe 'PUT update' do
     before(:each) do
       @checkin = checkins(:checkin_00001)
@@ -335,7 +457,7 @@ describe CheckinsController do
 
         it "re-renders the 'edit' template" do
           put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
-          response.should render_template('edit')
+          expect(response).to be_successful
         end
 
         it 'should not update checkin without item_identifier' do
@@ -364,12 +486,12 @@ describe CheckinsController do
       describe 'with invalid params' do
         it 'assigns the checkin as @checkin' do
           put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
-          assigns(:checkin).should_not be_valid
+          expect(assigns(:checkin)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, params: { id: @checkin.id, checkin: @invalid_attrs }
-          response.should render_template('edit')
+          expect(response).to be_successful
         end
       end
     end

data/spec/controllers/withdraws_controller_spec.rb

@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+describe WithdrawsController do
+  fixtures :all
+  let(:valid_attributes) do
+    FactoryBot.build(:withdraw).attributes.with_indifferent_access
+  end
+  let(:valid_create_attributes) do
+    { basket_id: Basket.find(valid_attributes[:basket_id]).id,
+      withdraw: { item_identifier: Item.find(valid_attributes[:item_id]).item_identifier }}
+  end
+
+  describe 'POST create' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'should not withdraw a checked-out item' do
+        expect do
+          post :create, params: { basket_id: valid_create_attributes[:basket_id], withdraw: { item_identifier: reserves(:reserve_00014).item.item_identifier } }
+        end.to change(Withdraw, :count).by(0)
+        expect(assigns(:withdraw)).to be_a(Withdraw)
+        expect(response).to be_successful
+      end
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425072340_create_manifestation_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425072349_create_item_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end