enju_purchase_request 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/order_list.rb +1 -1
- data/app/models/order_list_transition.rb +1 -1
- data/db/migrate/20180107155817_add_constraints_to_most_recent_for_order_list_transitions.rb +13 -0
- data/lib/enju_purchase_request/version.rb +1 -1
- data/lib/generators/enju_purchase_request/setup/setup_generator.rb +1 -0
- data/lib/generators/enju_purchase_request/update/update_generator.rb +8 -0
- data/spec/controllers/order_lists_controller_spec.rb +33 -33
- data/spec/controllers/orders_controller_spec.rb +34 -34
- data/spec/controllers/purchase_requests_controller_spec.rb +4 -4
- data/spec/dummy/db/migrate/005_create_manifestations.rb +0 -1
- data/spec/dummy/db/migrate/059_create_libraries.rb +7 -9
- data/spec/dummy/db/migrate/069_create_shelves.rb +3 -4
- data/spec/dummy/db/migrate/080_create_library_groups.rb +2 -3
- data/spec/dummy/db/migrate/120_create_baskets.rb +2 -3
- data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +4 -7
- data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +4 -5
- data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +2 -2
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +0 -1
- data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +3 -6
- data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +2 -2
- data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +1 -2
- data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +5 -1
- data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
- data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -3
- data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
- data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
- data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +5 -0
- data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +3 -5
- data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +6 -0
- data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +19 -6
- data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +15 -2
- data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +6 -0
- data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +11 -0
- data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +5 -0
- data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +5 -0
- data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +5 -0
- data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +5 -0
- data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +5 -0
- data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +5 -0
- data/spec/dummy/db/schema.rb +42 -12
- data/spec/factories/bookstore.rb +1 -1
- data/spec/factories/library.rb +2 -2
- data/spec/factories/order.rb +3 -3
- data/spec/factories/order_list.rb +3 -3
- data/spec/factories/profile.rb +1 -1
- data/spec/factories/purchase_request.rb +2 -2
- data/spec/factories/user.rb +1 -1
- data/spec/fixtures/library_groups.yml +1 -1
- data/spec/fixtures/order_list_transitions.yml +1 -1
- data/spec/rails_helper.rb +3 -3
- data/spec/support/controller_macros.rb +3 -3
- metadata +222 -240
@@ -244,7 +244,7 @@ describe PurchaseRequestsController do
|
|
244
244
|
|
245
245
|
describe "POST create" do
|
246
246
|
before(:each) do
|
247
|
-
@attrs =
|
247
|
+
@attrs = FactoryBot.attributes_for(:purchase_request)
|
248
248
|
@invalid_attrs = {:title => ''}
|
249
249
|
end
|
250
250
|
|
@@ -373,13 +373,13 @@ describe PurchaseRequestsController do
|
|
373
373
|
describe "PUT update" do
|
374
374
|
before(:each) do
|
375
375
|
@purchase_request = purchase_requests(:purchase_request_00001)
|
376
|
-
@attrs =
|
376
|
+
@attrs = FactoryBot.attributes_for(:purchase_request)
|
377
377
|
@invalid_attrs = {:title => ''}
|
378
378
|
end
|
379
379
|
|
380
380
|
describe "When logged in as Administrator" do
|
381
381
|
before(:each) do
|
382
|
-
@user =
|
382
|
+
@user = FactoryBot.create(:admin)
|
383
383
|
sign_in @user
|
384
384
|
end
|
385
385
|
|
@@ -409,7 +409,7 @@ describe PurchaseRequestsController do
|
|
409
409
|
|
410
410
|
describe "When logged in as Librarian" do
|
411
411
|
before(:each) do
|
412
|
-
@user =
|
412
|
+
@user = FactoryBot.create(:librarian)
|
413
413
|
sign_in @user
|
414
414
|
end
|
415
415
|
|
@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
|
|
13
13
|
t.string :access_address
|
14
14
|
t.integer :language_id, :default => 1, :null => false
|
15
15
|
t.integer :carrier_type_id, :default => 1, :null => false
|
16
|
-
t.integer :extent_id, :default => 1, :null => false
|
17
16
|
t.integer :start_page
|
18
17
|
t.integer :end_page
|
19
18
|
t.integer :height
|
@@ -1,9 +1,9 @@
|
|
1
1
|
class CreateLibraries < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :libraries do |t|
|
4
|
-
t.string :name, :null
|
4
|
+
t.string :name, index: true, null: false
|
5
5
|
t.text :display_name
|
6
|
-
t.string :short_display_name, :
|
6
|
+
t.string :short_display_name, null: false
|
7
7
|
t.string :zip_code
|
8
8
|
t.text :street
|
9
9
|
t.text :locality
|
@@ -12,17 +12,15 @@ class CreateLibraries < ActiveRecord::Migration
|
|
12
12
|
t.string :telephone_number_2
|
13
13
|
t.string :fax_number
|
14
14
|
t.text :note
|
15
|
-
t.integer :call_number_rows, :
|
16
|
-
t.string :call_number_delimiter, :
|
17
|
-
t.
|
18
|
-
t.integer :users_count, :
|
15
|
+
t.integer :call_number_rows, default: 1, null: false
|
16
|
+
t.string :call_number_delimiter, default: "|", null: false
|
17
|
+
t.references :library_group, index: true, null: false
|
18
|
+
t.integer :users_count, default: 0, null: false
|
19
19
|
t.integer :position
|
20
|
-
t.
|
20
|
+
t.references :country
|
21
21
|
|
22
22
|
t.timestamps
|
23
23
|
t.datetime :deleted_at
|
24
24
|
end
|
25
|
-
add_index :libraries, :library_group_id
|
26
|
-
add_index :libraries, :name, :unique => true
|
27
25
|
end
|
28
26
|
end
|
@@ -1,15 +1,14 @@
|
|
1
1
|
class CreateShelves < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :shelves do |t|
|
4
|
-
t.string :name, :
|
4
|
+
t.string :name, null: false
|
5
5
|
t.text :display_name
|
6
6
|
t.text :note
|
7
|
-
t.
|
8
|
-
t.integer :items_count, :
|
7
|
+
t.references :library, index: true, null: false
|
8
|
+
t.integer :items_count, default: 0, null: false
|
9
9
|
t.integer :position
|
10
10
|
t.timestamps
|
11
11
|
t.datetime :deleted_at
|
12
12
|
end
|
13
|
-
add_index :shelves, :library_id
|
14
13
|
end
|
15
14
|
end
|
@@ -1,9 +1,9 @@
|
|
1
1
|
class CreateLibraryGroups < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :library_groups do |t|
|
4
|
-
t.string :name, :
|
4
|
+
t.string :name, null: false
|
5
5
|
t.text :display_name
|
6
|
-
t.string :short_name, :null
|
6
|
+
t.string :short_name, index: true, null: false
|
7
7
|
t.text :my_networks
|
8
8
|
t.text :login_banner
|
9
9
|
t.text :note
|
@@ -12,6 +12,5 @@ class CreateLibraryGroups < ActiveRecord::Migration
|
|
12
12
|
|
13
13
|
t.timestamps
|
14
14
|
end
|
15
|
-
add_index :library_groups, :short_name
|
16
15
|
end
|
17
16
|
end
|
@@ -1,12 +1,11 @@
|
|
1
1
|
class CreateBaskets < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :baskets do |t|
|
4
|
-
t.
|
4
|
+
t.references :user, index: true
|
5
5
|
t.text :note
|
6
|
-
t.integer :lock_version, :
|
6
|
+
t.integer :lock_version, default: 0, null: false
|
7
7
|
|
8
8
|
t.timestamps
|
9
9
|
end
|
10
|
-
add_index :baskets, :user_id
|
11
10
|
end
|
12
11
|
end
|
@@ -1,17 +1,14 @@
|
|
1
1
|
class CreateSubscriptions < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :subscriptions do |t|
|
4
|
-
t.text :title, :
|
4
|
+
t.text :title, null: false
|
5
5
|
t.text :note
|
6
|
-
|
7
|
-
t.
|
8
|
-
t.integer :order_list_id
|
6
|
+
t.references :user, index: true
|
7
|
+
t.references :order_list, index: true
|
9
8
|
t.datetime :deleted_at
|
10
|
-
t.integer :subscribes_count, :
|
9
|
+
t.integer :subscribes_count, default: 0, null: false
|
11
10
|
|
12
11
|
t.timestamps
|
13
12
|
end
|
14
|
-
add_index :subscriptions, :user_id
|
15
|
-
add_index :subscriptions, :order_list_id
|
16
13
|
end
|
17
14
|
end
|
@@ -1,14 +1,13 @@
|
|
1
1
|
class CreateSubscribes < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :subscribes do |t|
|
4
|
-
t.
|
5
|
-
t.integer :work_id, :
|
6
|
-
t.datetime :start_at, :
|
7
|
-
t.datetime :end_at, :
|
4
|
+
t.references :subscription, index: true, null: false
|
5
|
+
t.integer :work_id, null: false
|
6
|
+
t.datetime :start_at, null: false
|
7
|
+
t.datetime :end_at, null: false
|
8
8
|
|
9
9
|
t.timestamps
|
10
10
|
end
|
11
|
-
add_index :subscribes, :subscription_id
|
12
11
|
add_index :subscribes, :work_id
|
13
12
|
end
|
14
13
|
end
|
@@ -8,7 +8,7 @@ class AddDcndlSchema < ActiveRecord::Migration
|
|
8
8
|
add_column :manifestations, :valid_until, :timestamp
|
9
9
|
add_column :manifestations, :date_submitted, :timestamp
|
10
10
|
add_column :manifestations, :date_accepted, :timestamp
|
11
|
-
add_column :manifestations, :
|
11
|
+
add_column :manifestations, :date_captured, :timestamp
|
12
12
|
rename_column :manifestations, :copyright_date, :date_copyrighted
|
13
13
|
end
|
14
14
|
|
@@ -21,7 +21,7 @@ class AddDcndlSchema < ActiveRecord::Migration
|
|
21
21
|
remove_column :manifestations, :valid_until
|
22
22
|
remove_column :manifestations, :date_submitted
|
23
23
|
remove_column :manifestations, :date_accepted
|
24
|
-
remove_column :manifestations, :
|
24
|
+
remove_column :manifestations, :date_captured
|
25
25
|
rename_column :manifestations, :date_copyrighted, :copyright_date
|
26
26
|
end
|
27
27
|
end
|
@@ -1,14 +1,11 @@
|
|
1
1
|
class CreateAccepts < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :accepts do |t|
|
4
|
-
t.
|
5
|
-
t.
|
6
|
-
t.
|
4
|
+
t.references :basket, index: true
|
5
|
+
t.references :item, index: true
|
6
|
+
t.references :librarian, index: true
|
7
7
|
|
8
8
|
t.timestamps
|
9
9
|
end
|
10
|
-
|
11
|
-
add_index :accepts, :basket_id
|
12
|
-
add_index :accepts, :item_id
|
13
10
|
end
|
14
11
|
end
|
@@ -1,8 +1,8 @@
|
|
1
1
|
class CreateUserImportResults < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :user_import_results do |t|
|
4
|
-
t.
|
5
|
-
t.
|
4
|
+
t.references :user_import_file, index: true
|
5
|
+
t.references :user, index: true
|
6
6
|
t.text :body
|
7
7
|
|
8
8
|
t.timestamps
|
@@ -2,7 +2,11 @@ class CreateResourceImportFileTransitions < ActiveRecord::Migration
|
|
2
2
|
def change
|
3
3
|
create_table :resource_import_file_transitions do |t|
|
4
4
|
t.string :to_state
|
5
|
-
|
5
|
+
if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
|
6
|
+
t.text :metadata
|
7
|
+
else
|
8
|
+
t.text :metadata, default: "{}"
|
9
|
+
end
|
6
10
|
t.integer :sort_key
|
7
11
|
t.integer :resource_import_file_id
|
8
12
|
t.timestamps
|
@@ -2,7 +2,11 @@ class CreateImportRequestTransitions < ActiveRecord::Migration
|
|
2
2
|
def change
|
3
3
|
create_table :import_request_transitions do |t|
|
4
4
|
t.string :to_state
|
5
|
-
|
5
|
+
if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
|
6
|
+
t.text :metadata
|
7
|
+
else
|
8
|
+
t.text :metadata, default: "{}"
|
9
|
+
end
|
6
10
|
t.integer :sort_key
|
7
11
|
t.integer :import_request_id
|
8
12
|
t.timestamps
|
@@ -2,7 +2,11 @@ class CreateAgentImportFileTransitions < ActiveRecord::Migration
|
|
2
2
|
def change
|
3
3
|
create_table :agent_import_file_transitions do |t|
|
4
4
|
t.string :to_state
|
5
|
-
|
5
|
+
if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
|
6
|
+
t.text :metadata
|
7
|
+
else
|
8
|
+
t.text :metadata, default: "{}"
|
9
|
+
end
|
6
10
|
t.integer :sort_key
|
7
11
|
t.integer :agent_import_file_id
|
8
12
|
t.timestamps
|
@@ -8,11 +8,10 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration
|
|
8
8
|
t.text :metadata, default: "{}"
|
9
9
|
end
|
10
10
|
t.integer :sort_key
|
11
|
-
t.
|
11
|
+
t.references :user_import_file, index: true
|
12
12
|
t.timestamps
|
13
13
|
end
|
14
14
|
|
15
|
-
add_index :user_import_file_transitions, :user_import_file_id
|
16
15
|
add_index :user_import_file_transitions, [:sort_key, :user_import_file_id], unique: true, name: "index_user_import_file_transitions_on_sort_key_and_file_id"
|
17
16
|
end
|
18
17
|
end
|
@@ -2,7 +2,11 @@ class CreateResourceExportFileTransitions < ActiveRecord::Migration
|
|
2
2
|
def change
|
3
3
|
create_table :resource_export_file_transitions do |t|
|
4
4
|
t.string :to_state
|
5
|
-
|
5
|
+
if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
|
6
|
+
t.text :metadata
|
7
|
+
else
|
8
|
+
t.text :metadata, default: "{}"
|
9
|
+
end
|
6
10
|
t.integer :sort_key
|
7
11
|
t.integer :resource_export_file_id
|
8
12
|
t.timestamps
|
@@ -1,14 +1,12 @@
|
|
1
1
|
class CreateColors < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :colors do |t|
|
4
|
-
t.
|
4
|
+
t.references :library_group, index: true
|
5
5
|
t.string :property
|
6
6
|
t.string :code
|
7
7
|
t.integer :position
|
8
8
|
|
9
9
|
t.timestamps
|
10
10
|
end
|
11
|
-
|
12
|
-
add_index :colors, :library_group_id
|
13
11
|
end
|
14
12
|
end
|
@@ -1,13 +1,11 @@
|
|
1
1
|
class CreateWithdraws < ActiveRecord::Migration
|
2
2
|
def change
|
3
3
|
create_table :withdraws do |t|
|
4
|
-
t.
|
5
|
-
t.
|
6
|
-
t.
|
4
|
+
t.references :basket, index: true
|
5
|
+
t.references :item, index: true
|
6
|
+
t.references :librarian, index: true
|
7
7
|
|
8
8
|
t.timestamps null: false
|
9
9
|
end
|
10
|
-
add_index :withdraws, :basket_id
|
11
|
-
add_index :withdraws, :item_id
|
12
10
|
end
|
13
11
|
end
|
@@ -1,13 +1,26 @@
|
|
1
|
+
# This migration comes from enju_library_engine (originally 20151213070943)
|
1
2
|
class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
|
2
3
|
def up
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
4
|
+
if defined?(Globalize)
|
5
|
+
LibraryGroup.create_translation_table!({
|
6
|
+
login_banner: :text
|
7
|
+
}, {
|
8
|
+
migrate_data: true
|
9
|
+
})
|
10
|
+
end
|
11
|
+
|
12
|
+
if defined?(AwesomeHstoreTranslate)
|
13
|
+
add_column :library_groups, :login_banner, :hstore
|
14
|
+
end
|
8
15
|
end
|
9
16
|
|
10
17
|
def down
|
11
|
-
|
18
|
+
if defined?(Globalize)
|
19
|
+
LibraryGroup.drop_translation_table! migrate_data: true
|
20
|
+
end
|
21
|
+
|
22
|
+
if defined?(AwesomeHstoreTranslate)
|
23
|
+
remove_column :library_groups, :login_banner
|
24
|
+
end
|
12
25
|
end
|
13
26
|
end
|