enju_library 0.4.0.beta.4 → 0.4.0.rc.1

data/db/migrate/20081006090811_create_subscriptions.rb

@@ -1,11 +1,10 @@
-class CreateSubscriptions < ActiveRecord::Migration[4.2]
+class CreateSubscriptions < ActiveRecord::Migration[5.2]
   def change
     create_table :subscriptions do |t|
       t.text :title, null: false
       t.text :note
       t.references :user, index: true
       t.references :order_list, index: true
-      t.datetime :deleted_at
       t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps

data/db/migrate/20081006093246_create_subscribes.rb

@@ -1,4 +1,4 @@
-class CreateSubscribes < ActiveRecord::Migration[4.2]
+class CreateSubscribes < ActiveRecord::Migration[5.2]
   def change
     create_table :subscribes do |t|
       t.references :subscription, index: true, null: false

data/db/migrate/20081023092436_create_search_engines.rb

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

data/db/migrate/20100211105551_add_admin_networks_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :library_groups, :admin_networks, :text
   end

data/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -1,4 +1,4 @@
-class AddOpeningHourToLibrary < ActiveRecord::Migration[4.2]
+class AddOpeningHourToLibrary < ActiveRecord::Migration[5.2]
   def self.up
     add_column :libraries, :opening_hour, :text
   end

data/db/migrate/20110222073537_add_url_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddUrlToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddUrlToLibraryGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :library_groups, :url, :string, default: 'http://localhost:3000/'
   end

data/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb

@@ -1,4 +1,4 @@
-class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration[4.2]
+class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :user_groups, :valid_period_for_new_user, :integer, default: 0, null: false
     add_column :user_groups, :expired_at, :timestamp

data/db/migrate/20120105074911_add_isil_to_library.rb

@@ -1,4 +1,4 @@
-class AddIsilToLibrary < ActiveRecord::Migration[4.2]
+class AddIsilToLibrary < ActiveRecord::Migration[5.2]
   def change
     add_column :libraries, :isil, :string
   end

data/db/migrate/20120129014038_create_budget_types.rb

@@ -1,4 +1,4 @@
-class CreateBudgetTypes < ActiveRecord::Migration[4.2]
+class CreateBudgetTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :budget_types do |t|
       t.string :name

data/db/migrate/20120319173203_create_accepts.rb

@@ -1,4 +1,4 @@
-class CreateAccepts < ActiveRecord::Migration[4.2]
+class CreateAccepts < ActiveRecord::Migration[5.2]
   def change
     create_table :accepts do |t|
       t.references :basket, index: true

data/db/migrate/20120510140958_add_closed_to_shelf.rb

@@ -1,4 +1,4 @@
-class AddClosedToShelf < ActiveRecord::Migration[4.2]
+class AddClosedToShelf < ActiveRecord::Migration[5.2]
   def change
     add_column :shelves, :closed, :boolean, default: false, null: false
   end

data/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb

@@ -1,4 +1,4 @@
-class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration[4.2]
+class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration[5.2]
   def change
     add_column :libraries, :latitude, :float
     add_column :libraries, :longitude, :float

data/db/migrate/20140110122216_create_user_import_files.rb

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

data/db/migrate/20140110131010_create_user_import_results.rb

@@ -1,4 +1,4 @@
-class CreateUserImportResults < ActiveRecord::Migration[4.2]
+class CreateUserImportResults < ActiveRecord::Migration[5.2]
   def change
     create_table :user_import_results do |t|
       t.references :user_import_file, index: true

data/db/migrate/20140524074813_create_user_import_file_transitions.rb

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

data/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb

@@ -1,4 +1,4 @@
-class AddUserEncodingToUserImportFile < ActiveRecord::Migration[4.2]
+class AddUserEncodingToUserImportFile < ActiveRecord::Migration[5.2]
   def change
     add_column :user_import_files, :user_encoding, :string
   end

data/db/migrate/20140709113413_create_user_export_files.rb

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

data/db/migrate/20140709113905_create_user_export_file_transitions.rb

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

data/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration[4.2]
+class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration[5.2]
   def change
     add_reference :user_import_files, :default_library
   end

data/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration[4.2]
+class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration[5.2]
   def change
     add_reference :user_import_files, :default_user_group
   end

data/db/migrate/20140821151023_create_colors.rb

@@ -1,4 +1,4 @@
-class CreateColors < ActiveRecord::Migration[4.2]
+class CreateColors < ActiveRecord::Migration[5.2]
   def change
     create_table :colors do |t|
       t.references :library_group, index: true

data/db/migrate/20150221063719_add_settings_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddSettingsToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddSettingsToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :settings, :text
   end

data/db/migrate/20150506105356_add_error_message_to_user_import_result.rb

@@ -1,4 +1,4 @@
-class AddErrorMessageToUserImportResult < ActiveRecord::Migration[4.2]
+class AddErrorMessageToUserImportResult < ActiveRecord::Migration[5.2]
   def change
     add_column :user_import_results, :error_message, :text
   end

data/db/migrate/20150924115059_create_withdraws.rb

@@ -1,4 +1,4 @@
-class CreateWithdraws < ActiveRecord::Migration[4.2]
+class CreateWithdraws < ActiveRecord::Migration[5.2]
   def change
     create_table :withdraws do |t|
       t.references :basket, index: true

data/db/migrate/20160610093229_add_html_snippet_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :html_snippet, :text
   end

data/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb

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

data/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb

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

data/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :max_number_of_results, :integer, default: 500
   end

data/db/migrate/20160813191733_add_family_name_first_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :family_name_first, :boolean, default: true
   end

data/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :pub_year_facet_range_interval, :integer, default: 10
   end

data/db/migrate/20160813203039_add_user_id_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddUserIdToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddUserIdToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_reference :library_groups, :user, index: true, foreign_key: true
   end

data/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddCsvCharsetConversionToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddCsvCharsetConversionToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :csv_charset_conversion, :boolean, null: false, default: false
   end

data/db/migrate/20171014084528_add_header_logo_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_attachment :library_groups, :header_logo
   end

data/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb

@@ -1,4 +1,4 @@
-class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration[4.2]
+class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration[5.2]
   def change
     rename_column :library_groups, :login_banner, :old_login_banner
   end

data/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb

@@ -1,4 +1,4 @@
-class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration[4.2]
+class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration[5.2]
   def change
     add_foreign_key :libraries, :library_groups, null: false
   end

data/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :header_logo_meta, :text
   end

data/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb

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

data/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb

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

data/db/migrate/20191216131755_add_email_to_library_group.rb

@@ -0,0 +1,6 @@
+class AddEmailToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :library_groups, :email, :string
+    add_index :library_groups, :email
+  end
+end

data/lib/enju_library/version.rb

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

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

@@ -5,8 +5,9 @@ class EnjuLibrary::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_library")
     return if file == 'fixture'
-    inject_into_file 'app/controllers/application_controller.rb',
-      "  include EnjuLibrary::Controller\n", after: "include EnjuLeaf::Controller\n"
-    append_to_file("app/models/user.rb", "Item.include(EnjuLibrary::EnjuItem)\n")
+    inject_into_class 'app/controllers/application_controller.rb', ApplicationController,
+      "  include EnjuLibrary::Controller\n"
+    inject_into_class 'app/models/user.rb', User,
+      "  include EnjuLibrary::EnjuUser\n"
   end
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml

@@ -11,8 +11,8 @@ one:
   position: 1
   login_banner_translations: {"ja": "オープンソース図書館システム Next-L Enju です。このメッセージは管理者としてログインした後に変更することができます。",
     "en": "Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator."}
-  footer_banner_translations: {"en":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system | [About this system](/page/about) | [Report bugs](https://github.com/next-l/enju_leaf/issues) | [Manual](https://next-l.github.io/manual/)",
-    "ja":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](https://next-l.github.io/manual/)"}
+  footer_banner_translations: {"en":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system \\| [About this system](/page/about) \\| [Report bugs](https://github.com/next-l/enju_leaf/issues) \\| [Manual](https://next-l.github.io/manual/)",
+    "ja":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム \\| [このシステムについて](/page/about) \\| [不具合を報告する](https://github.com/next-l/enju_leaf/issues) \\| [マニュアル](https://next-l.github.io/manual/)"}
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
   pub_year_facet_range_interval: 10

data/lib/generators/enju_library/setup/templates/db/fixtures/search_engines.yml

@@ -0,0 +1,9 @@
+search_engine_00001:
+  id: 1
+  name: NDL Search
+  url: https://iss.ndl.go.jp
+  base_url: https://iss.ndl.go.jp/books
+  http_method: get
+  query_param: any
+  note: 
+  position: 1

data/spec/dummy/app/assets/config/manifest.js

@@ -1,3 +1,5 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
+//= link icons/arrow_up.png
+//= link icons/arrow_down.png

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

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

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

@@ -5,5 +5,3 @@ class User < ApplicationRecord
 
   include EnjuLibrary::EnjuUser
 end
-
-Item.include(EnjuLibrary::EnjuItem)

data/spec/dummy/config/initializers/assets.rb

@@ -12,4 +12,4 @@ Rails.application.config.assets.paths << Rails.root.join('../../', 'node_modules
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
-Rails.application.config.assets.precompile += %w( icons/*.png )
+Rails.application.config.assets.precompile += %w( *.png icons/*.png *.gif enju_leaf/*.css print.css )

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

@@ -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

@@ -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

@@ -4,7 +4,6 @@ class CreateItems < ActiveRecord::Migration[4.2]
       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/20190818075603_add_memo_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddMemoToManifestation < ActiveRecord::Migration[5.2]
+  def change
+    add_column :manifestations, :memo, :text
+  end
+end

data/spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb

@@ -0,0 +1,5 @@
+class AddMemoToItem < ActiveRecord::Migration[5.2]
+  def change
+    add_column :items, :memo, :text
+  end
+end

data/spec/dummy/db/migrate/20191219122214_create_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :custom_properties do |t|
+      t.integer :resource_id, null: false
+      t.string :resource_type, null: false
+      t.text :label, null: false
+      t.text :value
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,18 +10,18 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_08_14_120827) do
+ActiveRecord::Schema.define(version: 2019_12_19_122214) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
-  create_table "accepts", id: :serial, force: :cascade do |t|
-    t.integer "basket_id"
-    t.integer "item_id"
-    t.integer "librarian_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "accepts", force: :cascade do |t|
+    t.bigint "basket_id"
+    t.bigint "item_id"
+    t.bigint "librarian_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["basket_id"], name: "index_accepts_on_basket_id"
     t.index ["item_id"], name: "index_accepts_on_item_id"
     t.index ["librarian_id"], name: "index_accepts_on_librarian_id"
@@ -150,7 +150,6 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.text "full_name_alternative"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.datetime "deleted_at"
     t.string "zip_code_1"
     t.string "zip_code_2"
     t.text "address_1"
@@ -191,12 +190,12 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["required_role_id"], name: "index_agents_on_required_role_id"
   end
 
-  create_table "baskets", id: :serial, force: :cascade do |t|
-    t.integer "user_id"
+  create_table "baskets", force: :cascade do |t|
+    t.bigint "user_id"
     t.text "note"
     t.integer "lock_version", default: 0, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["user_id"], name: "index_baskets_on_user_id"
   end
 
@@ -245,7 +244,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["user_id"], name: "index_bookmarks_on_user_id"
   end
 
-  create_table "bookstores", id: :serial, force: :cascade do |t|
+  create_table "bookstores", force: :cascade do |t|
     t.text "name", null: false
     t.string "zip_code"
     t.text "address"
@@ -254,18 +253,17 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.string "fax_number"
     t.string "url"
     t.integer "position"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "budget_types", id: :serial, force: :cascade do |t|
+  create_table "budget_types", force: :cascade do |t|
     t.string "name"
     t.text "display_name"
     t.text "note"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "display_name_translations", default: {}, null: false
   end
 
@@ -413,13 +411,13 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["parent_id"], name: "index_classifications_on_parent_id"
   end
 
-  create_table "colors", id: :serial, force: :cascade do |t|
-    t.integer "library_group_id"
+  create_table "colors", force: :cascade do |t|
+    t.bigint "library_group_id"
     t.string "property"
     t.string "code"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["library_group_id"], name: "index_colors_on_library_group_id"
   end
 
@@ -469,6 +467,15 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["work_id"], name: "index_creates_on_work_id"
   end
 
+  create_table "custom_properties", force: :cascade do |t|
+    t.integer "resource_id", null: false
+    t.string "resource_type", null: false
+    t.text "label", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "demands", id: :serial, force: :cascade do |t|
     t.integer "user_id"
     t.integer "item_id"
@@ -752,7 +759,6 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.string "item_identifier"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.datetime "deleted_at"
     t.integer "shelf_id", default: 1, null: false
     t.boolean "include_supplements", default: false, null: false
     t.text "note"
@@ -770,6 +776,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.string "binding_call_number"
     t.datetime "binded_at"
     t.integer "manifestation_id", null: false
+    t.text "memo"
     t.index ["binding_item_identifier"], name: "index_items_on_binding_item_identifier"
     t.index ["bookstore_id"], name: "index_items_on_bookstore_id"
     t.index ["checkout_type_id"], name: "index_items_on_checkout_type_id"
@@ -819,7 +826,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["item_id", "user_group_id"], name: "index_lending_policies_on_item_id_and_user_group_id", unique: true
   end
 
-  create_table "libraries", id: :serial, force: :cascade do |t|
+  create_table "libraries", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
     t.string "short_display_name", null: false
@@ -833,23 +840,23 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.text "note"
     t.integer "call_number_rows", default: 1, null: false
     t.string "call_number_delimiter", default: "|", null: false
-    t.integer "library_group_id", null: false
+    t.bigint "library_group_id", null: false
     t.integer "users_count", default: 0, null: false
     t.integer "position"
-    t.integer "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "deleted_at"
+    t.bigint "country_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "opening_hour"
     t.string "isil"
     t.float "latitude"
     t.float "longitude"
     t.jsonb "display_name_translations", default: {}, null: false
+    t.index ["country_id"], name: "index_libraries_on_country_id"
     t.index ["library_group_id"], name: "index_libraries_on_library_group_id"
     t.index ["name"], name: "index_libraries_on_name"
   end
 
-  create_table "library_groups", id: :serial, force: :cascade do |t|
+  create_table "library_groups", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
     t.string "short_name", null: false
@@ -858,8 +865,8 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.text "note"
     t.integer "country_id"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "admin_networks"
     t.boolean "allow_bookmark_external_url", default: false, null: false
     t.string "url", default: "http://localhost:3000/"
@@ -870,7 +877,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.boolean "family_name_first", default: true
     t.string "screenshot_generator"
     t.integer "pub_year_facet_range_interval", default: 10
-    t.integer "user_id"
+    t.bigint "user_id"
     t.boolean "csv_charset_conversion", default: false, null: false
     t.string "header_logo_file_name"
     t.string "header_logo_content_type"
@@ -880,6 +887,8 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.jsonb "display_name_translations", default: {}, null: false
     t.jsonb "login_banner_translations", default: {}, null: false
     t.jsonb "footer_banner_translations", default: {}, null: false
+    t.string "email"
+    t.index ["email"], name: "index_library_groups_on_email"
     t.index ["short_name"], name: "index_library_groups_on_short_name"
     t.index ["user_id"], name: "index_library_groups_on_user_id"
   end
@@ -975,7 +984,6 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.datetime "date_copyrighted"
     t.datetime "created_at"
     t.datetime "updated_at"
-    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
@@ -1025,6 +1033,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.text "publication_place"
     t.text "extent"
     t.text "dimensions"
+    t.text "memo"
     t.index ["access_address"], name: "index_manifestations_on_access_address"
     t.index ["date_of_publication"], name: "index_manifestations_on_date_of_publication"
     t.index ["doi"], name: "index_manifestations_on_doi"
@@ -1269,23 +1278,23 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["expression_id"], name: "index_realizes_on_expression_id"
   end
 
-  create_table "request_status_types", id: :serial, force: :cascade do |t|
+  create_table "request_status_types", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
     t.text "note"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "display_name_translations", default: {}, null: false
   end
 
-  create_table "request_types", id: :serial, force: :cascade do |t|
+  create_table "request_types", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
     t.text "note"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "display_name_translations", default: {}, null: false
   end
 
@@ -1437,7 +1446,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.jsonb "display_name_translations", default: {}, null: false
   end
 
-  create_table "search_engines", id: :serial, force: :cascade do |t|
+  create_table "search_engines", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
     t.string "url", null: false
@@ -1447,8 +1456,8 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.text "additional_param"
     t.text "note"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "display_name_translations", default: {}, null: false
   end
 
@@ -1516,16 +1525,15 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["series_statement_identifier"], name: "index_series_statements_on_series_statement_identifier"
   end
 
-  create_table "shelves", id: :serial, force: :cascade do |t|
+  create_table "shelves", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
     t.text "note"
-    t.integer "library_id", null: false
+    t.bigint "library_id", null: false
     t.integer "items_count", default: 0, null: false
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "deleted_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "closed", default: false, null: false
     t.jsonb "display_name_translations", default: {}, null: false
     t.index ["library_id"], name: "index_shelves_on_library_id"
@@ -1573,26 +1581,25 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["use_term_id"], name: "index_subjects_on_use_term_id"
   end
 
-  create_table "subscribes", id: :serial, force: :cascade do |t|
-    t.integer "subscription_id", null: false
+  create_table "subscribes", force: :cascade do |t|
+    t.bigint "subscription_id", null: false
     t.integer "work_id", null: false
     t.datetime "start_at", null: false
     t.datetime "end_at", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["subscription_id"], name: "index_subscribes_on_subscription_id"
     t.index ["work_id"], name: "index_subscribes_on_work_id"
   end
 
-  create_table "subscriptions", id: :serial, force: :cascade do |t|
+  create_table "subscriptions", force: :cascade do |t|
     t.text "title", null: false
     t.text "note"
-    t.integer "user_id"
-    t.integer "order_list_id"
-    t.datetime "deleted_at"
+    t.bigint "user_id"
+    t.bigint "order_list_id"
     t.integer "subscribes_count", default: 0, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["order_list_id"], name: "index_subscriptions_on_order_list_id"
     t.index ["user_id"], name: "index_subscriptions_on_user_id"
   end
@@ -1650,13 +1657,13 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["user_id"], name: "index_user_checkout_stats_on_user_id"
   end
 
-  create_table "user_export_file_transitions", id: :serial, force: :cascade do |t|
+  create_table "user_export_file_transitions", force: :cascade do |t|
     t.string "to_state"
     t.text "metadata", default: "{}"
     t.integer "sort_key"
-    t.integer "user_export_file_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.bigint "user_export_file_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "most_recent", null: false
     t.index ["sort_key", "user_export_file_id"], name: "index_user_export_file_transitions_on_sort_key_and_file_id", unique: true
     t.index ["user_export_file_id", "most_recent"], name: "index_user_export_file_transitions_parent_most_recent", unique: true, where: "most_recent"
@@ -1664,15 +1671,15 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["user_export_file_id"], name: "index_user_export_file_transitions_on_user_export_file_id"
   end
 
-  create_table "user_export_files", id: :serial, force: :cascade do |t|
-    t.integer "user_id"
+  create_table "user_export_files", force: :cascade do |t|
+    t.bigint "user_id"
     t.string "user_export_file_name"
     t.string "user_export_content_type"
     t.bigint "user_export_file_size"
     t.datetime "user_export_updated_at"
     t.datetime "executed_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["user_id"], name: "index_user_export_files_on_user_id"
   end
 
@@ -1695,14 +1702,13 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["user_group_id"], name: "index_user_group_has_checkout_types_on_user_group_id"
   end
 
-  create_table "user_groups", id: :serial, force: :cascade do |t|
+  create_table "user_groups", force: :cascade do |t|
     t.string "name"
     t.text "display_name"
     t.text "note"
     t.integer "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "deleted_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "valid_period_for_new_user", default: 0, null: false
     t.datetime "expired_at"
     t.integer "number_of_day_to_notify_overdue", default: 7, null: false
@@ -1720,21 +1726,21 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["user_id"], name: "index_user_has_roles_on_user_id"
   end
 
-  create_table "user_import_file_transitions", id: :serial, force: :cascade do |t|
+  create_table "user_import_file_transitions", force: :cascade do |t|
     t.string "to_state"
     t.text "metadata", default: "{}"
     t.integer "sort_key"
-    t.integer "user_import_file_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.bigint "user_import_file_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "most_recent", null: false
     t.index ["sort_key", "user_import_file_id"], name: "index_user_import_file_transitions_on_sort_key_and_file_id", unique: true
     t.index ["user_import_file_id", "most_recent"], name: "index_user_import_file_transitions_parent_most_recent", unique: true, where: "most_recent"
     t.index ["user_import_file_id"], name: "index_user_import_file_transitions_on_user_import_file_id"
   end
 
-  create_table "user_import_files", id: :serial, force: :cascade do |t|
-    t.integer "user_id"
+  create_table "user_import_files", force: :cascade do |t|
+    t.bigint "user_id"
     t.text "note"
     t.datetime "executed_at"
     t.string "user_import_file_name"
@@ -1744,20 +1750,22 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.string "user_import_fingerprint"
     t.string "edit_mode"
     t.text "error_message"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "user_encoding"
-    t.integer "default_library_id"
-    t.integer "default_user_group_id"
+    t.bigint "default_library_id"
+    t.bigint "default_user_group_id"
+    t.index ["default_library_id"], name: "index_user_import_files_on_default_library_id"
+    t.index ["default_user_group_id"], name: "index_user_import_files_on_default_user_group_id"
     t.index ["user_id"], name: "index_user_import_files_on_user_id"
   end
 
-  create_table "user_import_results", id: :serial, force: :cascade do |t|
-    t.integer "user_import_file_id"
-    t.integer "user_id"
+  create_table "user_import_results", force: :cascade do |t|
+    t.bigint "user_import_file_id"
+    t.bigint "user_id"
     t.text "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "error_message"
     t.index ["user_id"], name: "index_user_import_results_on_user_id"
     t.index ["user_import_file_id"], name: "index_user_import_results_on_user_import_file_id"
@@ -1830,10 +1838,10 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
 
-  create_table "withdraws", id: :serial, force: :cascade do |t|
-    t.integer "basket_id"
-    t.integer "item_id"
-    t.integer "librarian_id"
+  create_table "withdraws", force: :cascade do |t|
+    t.bigint "basket_id"
+    t.bigint "item_id"
+    t.bigint "librarian_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["basket_id"], name: "index_withdraws_on_basket_id"