enju_biblio 0.3.18 → 0.4.0.beta.1

data/app/models/agent_type.rb

@@ -1,5 +1,7 @@
 class AgentType < ApplicationRecord
   include MasterModel
+  default_scope { order('agent_types.position') }
+  translates :display_name
   has_many :agents
 end
 
@@ -7,11 +9,12 @@ end
 #
 # Table name: agent_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/carrier_type.rb

@@ -1,5 +1,7 @@
 class CarrierType < ApplicationRecord
   include MasterModel
+  default_scope { order("carrier_types.position") }
+  translates :display_name
   has_many :manifestations
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :attachment, storage: :s3,
@@ -34,15 +36,16 @@ end
 #
 # Table name: carrier_types
 #
-#  id                      :integer          not null, primary key
-#  name                    :string           not null
-#  display_name            :text
-#  note                    :text
-#  position                :integer
-#  created_at              :datetime
-#  updated_at              :datetime
-#  attachment_file_name    :string
-#  attachment_content_type :string
-#  attachment_file_size    :integer
-#  attachment_updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  attachment_file_name      :string
+#  attachment_content_type   :string
+#  attachment_file_size      :bigint
+#  attachment_updated_at     :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/content_type.rb

@@ -1,5 +1,7 @@
 class ContentType < ApplicationRecord
   include MasterModel
+  default_scope { order('content_types.position') }
+  translates :display_name
   has_many :manifestations
 end
 
@@ -7,11 +9,12 @@ end
 #
 # Table name: content_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/create_type.rb

@@ -7,11 +7,12 @@ end
 #
 # Table name: create_types
 #
-#  id           :integer          not null, primary key
-#  name         :string
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/form_of_work.rb

@@ -1,17 +1,20 @@
 class FormOfWork < ApplicationRecord
   include MasterModel
-  has_many :works, class_name: 'Manifestation' #, dependent: :restrict_with_exception
+  default_scope { order('form_of_works.position') }
+  translates :display_name
+  has_many :works
 end
 
 # == Schema Information
 #
 # Table name: form_of_works
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/frequency.rb

@@ -1,17 +1,20 @@
 class Frequency < ApplicationRecord
   include MasterModel
-  has_many :manifestations, dependent: :restrict_with_exception
+  default_scope { order('frequencies.position') }
+  translates :display_name
+  has_many :manifestations
 end
 
 # == Schema Information
 #
 # Table name: frequencies
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/identifier.rb

@@ -8,16 +8,12 @@ class Identifier < ApplicationRecord
   before_validation :normalize
   before_save :convert_isbn
   scope :id_type, -> type {
-    where(identifier_type: IdentifierType.find_by(name: type))
+    where(identifier_type: IdentifierType.where(name: type).first)
   }
 
   acts_as_list scope: :manifestation_id
   strip_attributes only: :body
 
-  after_destroy do
-    manifestation&.touch
-  end
-
   def check_identifier
     case identifier_type.try(:name)
     when 'isbn'

data/app/models/identifier_type.rb

@@ -1,5 +1,6 @@
 class IdentifierType < ApplicationRecord
   include MasterModel
+  default_scope { order('identifier_types.position') }
   has_many :identifiers
   validates :name, format: { with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/ }
 end

data/app/models/import_request.rb

@@ -7,8 +7,6 @@ class ImportRequest < ApplicationRecord
   validate :check_isbn
   #validate :check_imported, on: :create
   #validates_uniqueness_of :isbn, if: Proc.new{|request| ImportRequest.where("created_at > ?", 1.day.ago).collect(&:isbn).include?(request.isbn)}
-  enju_ndl_ndl_search if defined?(EnjuNdl)
-  enju_nii_cinii_books if defined?(EnjuNii)
 
   has_many :import_request_transitions, autosave: false
 
@@ -27,8 +25,9 @@ class ImportRequest < ApplicationRecord
 
   def check_imported
     if isbn.present?
-      identifier_type = IdentifierType.find_by_or_create!(name: 'isbn')
-      if Identifier.find_by(body: isbn, identifier_type_id: identifier_type.id)&.manifestation
+      identifier_type = IdentifierType.where(name: 'isbn').first
+      identifier_type = IdentifierType.where(name: 'isbn').create! unless identifier_type
+      if Identifier.where(body: isbn, identifier_type_id: identifier_type.id).first.try(:manifestation)
         errors.add(:isbn, I18n.t('import_request.isbn_taken'))
       end
     end

data/app/{models2 → models}/isbn_record.rb

@@ -1,4 +1,4 @@
-class IsbnRecord < ApplicationRecord
+class IsbnRecord < ActiveRecord::Base
   has_many :isbn_record_and_manifestations, dependent: :destroy
   has_many :manifestations, through: :isbn_record_and_manifestations
   before_save :normalize_isbn

data/app/{models2 → models}/issn_record.rb

@@ -1,4 +1,4 @@
-class IssnRecord < ApplicationRecord
+class IssnRecord < ActiveRecord::Base
   has_many :issn_record_and_manifestations, dependent: :destroy
   has_many :manifestations, through: :issn_record_and_manifestations
   has_many :issn_record_and_periodicals, dependent: :destroy

data/app/models/item.rb

@@ -10,7 +10,7 @@ class Item < ApplicationRecord
   delegate :display_name, to: :shelf, prefix: true
   has_many :owns
   has_many :agents, through: :owns
-  has_many :donates, dependent: :destroy
+  has_many :donates
   has_many :donors, through: :donates, source: :agent
   has_one :resource_import_result
   belongs_to :manifestation, touch: true
@@ -19,12 +19,10 @@ class Item < ApplicationRecord
   belongs_to :budget_type, optional: true
   has_one :accept, dependent: :destroy
   has_one :withdraw, dependent: :destroy
-  has_many :item_custom_values, -> { joins(:item_custom_property).order(:position) }, dependent: :destroy
+  scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
 
   belongs_to :shelf, counter_cache: true
-  accepts_nested_attributes_for :item_custom_values, reject_if: :all_blank
 
-  scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
   validates_associated :bookstore
   validates :manifestation_id, presence: true
   validates :item_identifier, allow_blank: true, uniqueness: true,
@@ -66,23 +64,23 @@ class Item < ApplicationRecord
   paginates_per 10
 
   def title
-    manifestation&.original_title
+    manifestation.try(:original_title)
   end
 
   def creator
-    manifestation&.creator
+    manifestation.try(:creator)
   end
 
   def contributor
-    manifestation&.contributor
+    manifestation.try(:contributor)
   end
 
   def publisher
-    manifestation&.publisher
+    manifestation.try(:publisher)
   end
 
   def owned(agent)
-    owns.find_by(agent_id: agent.id)
+    owns.where(agent_id: agent.id).first
   end
 
   def manifestation_url
@@ -98,52 +96,6 @@ class Item < ApplicationRecord
       true
     end
   end
-
-  def self.csv_header(role: 'Guest')
-    Item.new.to_hash(role: role).keys
-  end
-
-  def to_hash(role: 'Guest')
-    record = {
-      item_id: id,
-      item_identifier: item_identifier,
-      binding_item_identifier: binding_item_identifier,
-      call_number: call_number,
-      library: shelf&.library&.name,
-      shelf: shelf&.name,
-      item_note: note,
-      accepted_at: accept&.created_at,
-      acquired_at: acquired_at,
-      item_created_at: created_at,
-      item_updated_at: updated_at
-    }
-
-    if ['Administrator', 'Librarian'].include?(role)
-      record.merge!({
-        bookstore: bookstore&.name,
-        budget_type: budget_type&.name,
-        item_required_role: required_role.name,
-        item_price: price,
-        item_memo: memo
-      })
-
-      ItemCustomProperty.order(:position).each do |custom_property|
-        custom_value = item_custom_values.find_by(item_custom_property: custom_property)
-        record[:"item:#{custom_property.name}"] = custom_value.try(:value)
-      end
-
-      if defined?(EnjuCirculation)
-        record.merge!({
-          use_restriction: use_restriction&.name,
-          circulation_status: circulation_status&.name,
-          checkout_type: checkout_type&.name,
-          total_checkouts: checkouts.count
-        })
-      end
-    end
-
-    record
-  end
 end
 
 # == Schema Information
@@ -173,5 +125,4 @@ end
 #  binding_call_number     :string
 #  binded_at               :datetime
 #  manifestation_id        :integer          not null
-#  memo                    :text
 #

data/app/models/language.rb

@@ -24,13 +24,14 @@ end
 #
 # Table name: languages
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  native_name  :string
-#  display_name :text
-#  iso_639_1    :string
-#  iso_639_2    :string
-#  iso_639_3    :string
-#  note         :text
-#  position     :integer
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  native_name               :string
+#  display_name              :text
+#  iso_639_1                 :string
+#  iso_639_2                 :string
+#  iso_639_3                 :string
+#  note                      :text
+#  position                  :integer
+#  display_name_translations :jsonb            not null
 #

data/app/models/license.rb

@@ -1,16 +1,18 @@
 class License < ApplicationRecord
   include MasterModel
+  default_scope { order('licenses.position') }
 end
 
 # == Schema Information
 #
 # Table name: licenses
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :string
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :string
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #