enju_circulation 0.4.0.beta.4 → 0.4.0.rc.1

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

@@ -11,8 +11,8 @@
 
 <%- @user_group_has_checkout_types.each do |user_group_has_checkout_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to user_group_has_checkout_type.user_group.display_name.localize, user_group_has_checkout_type.user_group -%></td>
-    <td><%= link_to user_group_has_checkout_type.checkout_type.display_name.localize, user_group_has_checkout_type.checkout_type -%></td>
+    <td><%= link_to user_group_has_checkout_type.user_group.display_name, user_group_has_checkout_type.user_group -%></td>
+    <td><%= link_to user_group_has_checkout_type.checkout_type.display_name, user_group_has_checkout_type.checkout_type -%></td>
     <td>
       <%= link_to t('page.show'), user_group_has_checkout_type -%>
       <%- if policy(user_group_has_checkout_type).update? -%>

data/config/locales/translation_en.yml

@@ -124,6 +124,18 @@ en:
       profile:
         checkout_icalendar_token: Checkout iCalendar token
         save_checkout_history: Save checkout history
+    errors:
+      models:
+        item:
+          attributes:
+            circulation_status_id:
+              is_rented: Circulation status is invalid. This item is rented.
+              is_reserved: Circulation status is invalid. This item is reserved.
+        withdraw:
+          attributes:
+            item_id:
+              is_rented: is rented.
+              is_reserved: is reserved.
 
   basket:
     this_account_is_suspended: "This account is suspended."

data/config/locales/translation_ja.yml

@@ -122,6 +122,18 @@ ja:
       profile:
         checkout_icalendar_token: 貸出iCalendarのトークン
         save_checkout_history: 貸出の履歴を保存する
+    errors:
+      models:
+        item:
+          attributes:
+            circulation_status_id:
+              is_rented: この貸出状態には変更できません。資料が貸し出されています。
+              is_reserved: この貸出状態には変更できません。資料が予約されています。
+        withdraw:
+          attributes:
+            item_id:
+              is_rented: は貸し出されています。
+              is_reserved: は予約されています。
 
   basket:
     this_account_is_suspended: "このアカウントは停止されています。"

data/db/migrate/032_create_checkins.rb

@@ -1,4 +1,4 @@
-class CreateCheckins < ActiveRecord::Migration[4.2]
+class CreateCheckins < ActiveRecord::Migration[5.2]
   def self.up
     create_table :checkins do |t|
       t.references :item, index: true, foreign_key: true, null: false

data/db/migrate/033_create_checkouts.rb

@@ -1,4 +1,4 @@
-class CreateCheckouts < ActiveRecord::Migration[4.2]
+class CreateCheckouts < ActiveRecord::Migration[5.2]
   def self.up
     create_table :checkouts do |t|
       t.references :user, index: true, foreign_key: true

data/db/migrate/035_create_reserves.rb

@@ -1,5 +1,5 @@
-class CreateReserves < ActiveRecord::Migration[4.2]
-  def self.up
+class CreateReserves < ActiveRecord::Migration[5.2]
+  def change
     create_table :reserves do |t|
       t.references :user, index: true, foreign_key: true, null: false
       t.references :manifestation, index: true, null: false
@@ -9,13 +9,8 @@ class CreateReserves < ActiveRecord::Migration[4.2]
       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
     end
   end
-
-  def self.down
-    drop_table :reserves
-  end
 end

data/db/migrate/121_create_checked_items.rb

@@ -1,4 +1,4 @@
-class CreateCheckedItems < ActiveRecord::Migration[4.2]
+class CreateCheckedItems < ActiveRecord::Migration[5.2]
   def self.up
     create_table :checked_items do |t|
       t.references :item, index: true, foreign_key: true, null: false

data/db/migrate/127_create_use_restrictions.rb

@@ -1,4 +1,4 @@
-class CreateUseRestrictions < ActiveRecord::Migration[4.2]
+class CreateUseRestrictions < ActiveRecord::Migration[5.2]
   def self.up
     create_table :use_restrictions do |t|
       t.string :name, null: false

data/db/migrate/129_create_item_has_use_restrictions.rb

@@ -1,4 +1,4 @@
-class CreateItemHasUseRestrictions < ActiveRecord::Migration[4.2]
+class CreateItemHasUseRestrictions < ActiveRecord::Migration[5.2]
   def self.up
     create_table :item_has_use_restrictions do |t|
       t.references :item, index: true, foreign_key: true, null: false

data/db/migrate/132_create_circulation_statuses.rb

@@ -1,4 +1,4 @@
-class CreateCirculationStatuses < ActiveRecord::Migration[4.2]
+class CreateCirculationStatuses < ActiveRecord::Migration[5.2]
   def self.up
     create_table :circulation_statuses do |t|
       t.string :name, null: false

data/db/migrate/20081030023412_create_checkout_types.rb

@@ -1,4 +1,4 @@
-class CreateCheckoutTypes < ActiveRecord::Migration[4.2]
+class CreateCheckoutTypes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :checkout_types do |t|
       t.string :name, null: false

data/db/migrate/20081030023518_create_user_group_has_checkout_types.rb

@@ -1,4 +1,4 @@
-class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration[4.2]
+class CreateUserGroupHasCheckoutTypes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :user_group_has_checkout_types do |t|
       t.references :user_group, index: true, foreign_key: true, null: false

data/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb

@@ -1,4 +1,4 @@
-class CreateCarrierTypeHasCheckoutTypes < ActiveRecord::Migration[4.2]
+class CreateCarrierTypeHasCheckoutTypes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :carrier_type_has_checkout_types do |t|
       t.references :carrier_type, index: false, foreign_key: true, null: false

data/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb

@@ -1,4 +1,4 @@
-class CreateCheckoutStatHasManifestations < ActiveRecord::Migration[4.2]
+class CreateCheckoutStatHasManifestations < ActiveRecord::Migration[5.2]
   def self.up
     create_table :checkout_stat_has_manifestations do |t|
       t.references :manifestation_checkout_stat, index: false, null: false

data/db/migrate/20081212080038_create_manifestation_checkout_stats.rb

@@ -1,4 +1,4 @@
-class CreateManifestationCheckoutStats < ActiveRecord::Migration[4.2]
+class CreateManifestationCheckoutStats < ActiveRecord::Migration[5.2]
   def self.up
     create_table :manifestation_checkout_stats do |t|
       t.datetime :start_date

data/db/migrate/20081215094302_create_user_checkout_stats.rb

@@ -1,4 +1,4 @@
-class CreateUserCheckoutStats < ActiveRecord::Migration[4.2]
+class CreateUserCheckoutStats < ActiveRecord::Migration[5.2]
   def self.up
     create_table :user_checkout_stats do |t|
       t.datetime :start_date

data/db/migrate/20081215094955_create_checkout_stat_has_users.rb

@@ -1,4 +1,4 @@
-class CreateCheckoutStatHasUsers < ActiveRecord::Migration[4.2]
+class CreateCheckoutStatHasUsers < ActiveRecord::Migration[5.2]
   def self.up
     create_table :checkout_stat_has_users do |t|
       t.references :user_checkout_stat, index: true, foreign_key: true, null: false

data/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb

@@ -1,4 +1,4 @@
-class CreateReserveStatHasManifestations < ActiveRecord::Migration[4.2]
+class CreateReserveStatHasManifestations < ActiveRecord::Migration[5.2]
   def self.up
     create_table :reserve_stat_has_manifestations do |t|
       t.references :manifestation_reserve_stat, index: false, null: false

data/db/migrate/20081216190724_create_manifestation_reserve_stats.rb

@@ -1,4 +1,4 @@
-class CreateManifestationReserveStats < ActiveRecord::Migration[4.2]
+class CreateManifestationReserveStats < ActiveRecord::Migration[5.2]
   def self.up
     create_table :manifestation_reserve_stats do |t|
       t.datetime :start_date

data/db/migrate/20081220023628_create_user_reserve_stats.rb

@@ -1,4 +1,4 @@
-class CreateUserReserveStats < ActiveRecord::Migration[4.2]
+class CreateUserReserveStats < ActiveRecord::Migration[5.2]
   def self.up
     create_table :user_reserve_stats do |t|
       t.datetime :start_date

data/db/migrate/20081220034117_create_reserve_stat_has_users.rb

@@ -1,4 +1,4 @@
-class CreateReserveStatHasUsers < ActiveRecord::Migration[4.2]
+class CreateReserveStatHasUsers < ActiveRecord::Migration[5.2]
   def self.up
     create_table :reserve_stat_has_users do |t|
       t.references :user_reserve_stat, index: true, foreign_key: true, null: false

data/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb

@@ -1,4 +1,4 @@
-class AddCompletedAtToUserCheckoutStat < ActiveRecord::Migration[4.2]
+class AddCompletedAtToUserCheckoutStat < ActiveRecord::Migration[5.2]
   def self.up
     add_column :user_checkout_stats, :started_at, :datetime
     add_column :user_checkout_stats, :completed_at, :datetime

data/db/migrate/20110301134521_add_expire_date_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddExpireDateToReserve < ActiveRecord::Migration[4.2]
+class AddExpireDateToReserve < ActiveRecord::Migration[5.2]
   def self.up
     add_column :reserves, :expire_date, :string
   end

data/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb

@@ -1,4 +1,4 @@
-class AddCurrentCheckoutCountToUserGroupHasCheckoutType < ActiveRecord::Migration[4.2]
+class AddCurrentCheckoutCountToUserGroupHasCheckoutType < ActiveRecord::Migration[5.2]
   def self.up
     add_column :user_group_has_checkout_types, :current_checkout_count, :integer
   end

data/db/migrate/20110621093332_remove_expire_date_from_reserve.rb

@@ -1,4 +1,4 @@
-class RemoveExpireDateFromReserve < ActiveRecord::Migration[4.2]
+class RemoveExpireDateFromReserve < ActiveRecord::Migration[5.2]
   def self.up
     remove_column :reserves, :expire_date
   end

data/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb

@@ -1,8 +1,8 @@
-class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration[4.2]
+class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration[5.2]
   def self.up
-    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 7, null: false
-    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 3, null: false
-    add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 3, null: false
+    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 0, null: false
+    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 0, null: false
+    add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 0, null: false
   end
 
   def self.down

data/db/migrate/20111129044509_add_pickup_location_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddPickupLocationToReserve < ActiveRecord::Migration[4.2]
+class AddPickupLocationToReserve < ActiveRecord::Migration[5.2]
   def change
     add_column :reserves, :pickup_location_id, :integer
     add_index :reserves, :pickup_location_id

data/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb

@@ -1,4 +1,4 @@
-class AddLibrarianIdToCheckedItem < ActiveRecord::Migration[4.2]
+class AddLibrarianIdToCheckedItem < ActiveRecord::Migration[5.2]
   def change
     add_reference :checked_items, :user, index: true, foreign_key: true, column_name: :librarian_id
   end

data/db/migrate/20130303124821_add_retained_at_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddRetainedAtToReserve < ActiveRecord::Migration[4.2]
+class AddRetainedAtToReserve < ActiveRecord::Migration[5.2]
   def change
     add_column :reserves, :retained_at, :datetime
   end

data/db/migrate/20130304015019_add_postponed_at_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddPostponedAtToReserve < ActiveRecord::Migration[4.2]
+class AddPostponedAtToReserve < ActiveRecord::Migration[5.2]
   def change
     add_column :reserves, :postponed_at, :datetime
   end

data/db/migrate/20130416054135_add_circulation_status_id_to_item.rb

@@ -1,4 +1,4 @@
-class AddCirculationStatusIdToItem < ActiveRecord::Migration[4.2]
+class AddCirculationStatusIdToItem < ActiveRecord::Migration[5.2]
   def change
     add_column :items, :circulation_status_id, :integer, default: 5, null: false
     add_column :items, :checkout_type_id, :integer, default: 1, null: false

data/db/migrate/20130519065638_add_lock_version_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddLockVersionToReserve < ActiveRecord::Migration[4.2]
+class AddLockVersionToReserve < ActiveRecord::Migration[5.2]
   def change
     add_column :reserves, :lock_version, :integer, default: 0, null: false
   end

data/db/migrate/20130519065837_add_lock_version_to_checkin.rb

@@ -1,4 +1,4 @@
-class AddLockVersionToCheckin < ActiveRecord::Migration[4.2]
+class AddLockVersionToCheckin < ActiveRecord::Migration[5.2]
   def change
     add_column :checkins, :lock_version, :integer, default: 0, null: false
   end

data/db/migrate/20140518050147_create_reserve_transitions.rb

@@ -1,4 +1,4 @@
-class CreateReserveTransitions < ActiveRecord::Migration[4.2]
+class CreateReserveTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :reserve_transitions do |t|
       t.string :to_state

data/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb

@@ -1,4 +1,4 @@
-class CreateUserCheckoutStatTransitions < ActiveRecord::Migration[4.2]
+class CreateUserCheckoutStatTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :user_checkout_stat_transitions do |t|
       t.string :to_state

data/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb

@@ -1,4 +1,4 @@
-class CreateUserReserveStatTransitions < ActiveRecord::Migration[4.2]
+class CreateUserReserveStatTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :user_reserve_stat_transitions do |t|
       t.string :to_state

data/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb

@@ -1,4 +1,4 @@
-class CreateManifestationCheckoutStatTransitions < ActiveRecord::Migration[4.2]
+class CreateManifestationCheckoutStatTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :manifestation_checkout_stat_transitions do |t|
       t.string :to_state

data/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb

@@ -1,4 +1,4 @@
-class CreateManifestationReserveStatTransitions < ActiveRecord::Migration[4.2]
+class CreateManifestationReserveStatTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :manifestation_reserve_stat_transitions do |t|
       t.string :to_state

data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb

@@ -1,4 +1,4 @@
-class AddUserIdToUserCheckoutStat < ActiveRecord::Migration[4.2]
+class AddUserIdToUserCheckoutStat < ActiveRecord::Migration[5.2]
   def change
     add_reference :user_checkout_stats, :user, index: true, foreign_key: true
     add_reference :user_reserve_stats, :user, index: true, foreign_key: true

data/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb

@@ -1,4 +1,4 @@
-class AddCheckoutIcalendarTokenToProfile < ActiveRecord::Migration[4.2]
+class AddCheckoutIcalendarTokenToProfile < ActiveRecord::Migration[5.2]
   def change
     add_column :profiles, :checkout_icalendar_token, :string
     add_index :profiles, :checkout_icalendar_token, unique: true

data/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb

@@ -1,4 +1,4 @@
-class AddSaveCheckoutHistoryToProfile < ActiveRecord::Migration[4.2]
+class AddSaveCheckoutHistoryToProfile < ActiveRecord::Migration[5.2]
   def change
     add_column :profiles, :save_checkout_history, :boolean, default: false, null: false
   end

data/db/migrate/20141014065831_add_shelf_id_to_checkout.rb

@@ -1,4 +1,4 @@
-class AddShelfIdToCheckout < ActiveRecord::Migration[4.2]
+class AddShelfIdToCheckout < ActiveRecord::Migration[5.2]
   def change
     add_reference :checkouts, :shelf, index: true, foreign_key: true
   end

data/db/migrate/20141020120523_add_library_id_to_checkout.rb

@@ -1,4 +1,4 @@
-class AddLibraryIdToCheckout < ActiveRecord::Migration[4.2]
+class AddLibraryIdToCheckout < ActiveRecord::Migration[5.2]
   def change
     add_reference :checkouts, :library, index: true, foreign_key: true
   end

data/db/migrate/20150106001709_create_demands.rb

@@ -1,4 +1,4 @@
-class CreateDemands < ActiveRecord::Migration[4.2]
+class CreateDemands < ActiveRecord::Migration[5.2]
   def change
     create_table :demands do |t|
       t.references :user, index: true, foreign_key: true

data/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToReserveTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToReserveTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :reserve_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToManifestationCheckoutStatTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToManifestationCheckoutStatTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :manifestation_checkout_stat_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToManifestationReserveStatTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToManifestationReserveStatTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :manifestation_reserve_stat_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToUserCheckoutStatTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToUserCheckoutStatTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :user_checkout_stat_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToUserReserveStatTransitions < ActiveRecord::Migration[4.2]
+class AddMostRecentToUserReserveStatTransitions < ActiveRecord::Migration[5.2]
   def up
     add_column :user_reserve_stat_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb

@@ -1,4 +1,4 @@
-class AddForeignKeyOnManifestationIdToReserve < ActiveRecord::Migration[4.2]
+class AddForeignKeyOnManifestationIdToReserve < ActiveRecord::Migration[5.2]
   def change
     add_foreign_key :reserves, :manifestations
   end

data/db/migrate/20180107161035_add_constraints_to_most_recent_for_reserve_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForReserveTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForReserveTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107161951_add_constraints_to_most_recent_for_user_checkout_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForUserCheckoutStatTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForUserCheckoutStatTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107162009_add_constraints_to_most_recent_for_user_reserve_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForUserReserveStatTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForUserReserveStatTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107162029_add_constraints_to_most_recent_for_manifestation_checkout_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForManifestationCheckoutStatTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForManifestationCheckoutStatTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107162048_add_constraints_to_most_recent_for_manifestation_reserve_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForManifestationReserveStatTransitions < ActiveRecord::Migration[4.2]
+class AddConstraintsToMostRecentForManifestationReserveStatTransitions < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20190713114724_add_checkout_id_to_checkin.rb

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

data/lib/enju_circulation/version.rb

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

data/spec/controllers/items_controller_spec.rb

@@ -37,6 +37,40 @@ describe ItemsController do
         expect(assigns(:item)).to be_valid
         expect(response).to redirect_to item_url(assigns(:item))
       end
+
+      it 'should not create item without manifestation_id' do
+        lambda do
+          post :create, params: { item: { circulation_status_id: 1 } }
+        end.should raise_error(ActiveRecord::RecordNotFound)
+        expect(assigns(:item)).to_not be_valid
+        # expect(response).to be_missing
+      end
+
+      it 'should not create item already created' do
+        post :create, params: { item: { circulation_status_id: 1, item_identifier: '00001', manifestation_id: 1 } }
+        expect(assigns(:item)).to_not be_valid
+        expect(response).to be_successful
+      end
+    end
+  end
+
+  describe 'PUT update' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'should remove an item' do
+        item = FactoryBot.create(:item)
+        put :update, params: { id: item.id, item: {circulation_status_id: CirculationStatus.find_by(name: 'Removed').id } }
+        expect(assigns(:item).valid?).to be_truthy
+        expect(response).to redirect_to item_url(assigns(:item))
+      end
+
+      it 'should not remove a reserved item' do
+        item = FactoryBot.create(:reserve).item
+        put :update, params: { id: item.id, item: {circulation_status_id: CirculationStatus.find_by(name: 'Removed').id } }
+        expect(assigns(:item).valid?).to be_falsy
+        expect(response).to be_successful
+      end
     end
   end
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -4,7 +4,6 @@ class ApplicationController < ActionController::Base
   include EnjuLibrary::Controller
   include EnjuBiblio::Controller
   include EnjuCirculation::Controller
-  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized
 
   include Pundit

data/spec/dummy/app/helpers/application_helper.rb

@@ -2,6 +2,4 @@
 module ApplicationHelper
   include EnjuLeaf::ApplicationHelper
   include EnjuBiblio::ApplicationHelper
-  include EnjuManifestationViewer::ManifestationViewerHelper
-  include EnjuManifestationViewer::BookJacketHelper
 end

data/spec/dummy/app/models/user.rb

@@ -12,7 +12,6 @@ end
 Accept.include(EnjuCirculation::EnjuAccept)
 Basket.include(EnjuCirculation::EnjuBasket)
 Manifestation.include(EnjuCirculation::EnjuManifestation)
-Manifestation.include(EnjuManifestationViewer::EnjuManifestation)
 Item.include(EnjuCirculation::EnjuItem)
 Item.include(EnjuLibrary::EnjuItem)
 Profile.include(EnjuCirculation::EnjuProfile)

data/spec/dummy/config/application.rb

@@ -4,7 +4,6 @@ require 'rails/all'
 
 Bundler.require(*Rails.groups)
 require "enju_circulation"
-require "enju_manifestation_viewer"
 require "enju_leaf"
 
 module Dummy

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,4 +1,4 @@
-class CreateAgents < ActiveRecord::Migration[4.2]
+class CreateAgents < ActiveRecord::Migration[5.2]
   def change
     create_table :agents do |t|
       t.string :last_name
@@ -13,7 +13,6 @@ class CreateAgents < ActiveRecord::Migration[4.2]
       t.text :full_name_transcription
       t.text :full_name_alternative
       t.timestamps
-      t.datetime :deleted_at
       t.string :zip_code_1
       t.string :zip_code_2
       t.text :address_1

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -1,4 +1,4 @@
-class CreateManifestations < ActiveRecord::Migration[4.2]
+class CreateManifestations < ActiveRecord::Migration[5.2]
   def change
     create_table :manifestations do |t|
       t.text :original_title, null: false
@@ -9,7 +9,6 @@ class CreateManifestations < ActiveRecord::Migration[4.2]
       t.datetime :date_of_publication
       t.datetime :copyright_date
       t.timestamps
-      t.datetime :deleted_at
       t.string :access_address
       t.integer :language_id, default: 1, null: false
       t.integer :carrier_type_id, default: 1, null: false

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,10 +1,9 @@
-class CreateItems < ActiveRecord::Migration[4.2]
+class CreateItems < ActiveRecord::Migration[5.2]
   def change
     create_table :items do |t|
       t.string :call_number
       t.string :item_identifier
       t.timestamps
-      t.datetime :deleted_at
       t.integer :shelf_id, default: 1, null: false
       t.boolean :include_supplements, default: false, null: false
       t.text :note

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -1,4 +1,4 @@
-class CreateOwns < ActiveRecord::Migration[4.2]
+class CreateOwns < ActiveRecord::Migration[5.2]
   def change
     create_table :owns do |t|
       t.references :agent, null: false
@@ -6,7 +6,5 @@ class CreateOwns < ActiveRecord::Migration[4.2]
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :agent_id
-    add_index :owns, :item_id
   end
 end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -1,4 +1,4 @@
-class CreateCreates < ActiveRecord::Migration[4.2]
+class CreateCreates < ActiveRecord::Migration[5.2]
   def change
     create_table :creates do |t|
       t.references :agent, null: false
@@ -6,7 +6,5 @@ class CreateCreates < ActiveRecord::Migration[4.2]
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :agent_id
-    add_index :creates, :work_id
   end
 end

data/spec/dummy/db/migrate/041_create_roles.rb

@@ -1,4 +1,4 @@
-class CreateRoles < ActiveRecord::Migration[4.2]
+class CreateRoles < ActiveRecord::Migration[5.2]
   def change
     create_table "roles" do |t|
       t.column :name, :string, null: false