enju_biblio 0.3.13 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa249847e374fa2a87ea6801bfb851af30e99edc72fd982a32ce52d1674fa0c
-  data.tar.gz: 5ab7f1b8abd52e9c841c0445dd1a04db2d752fd077aada5672d70ea2ed2d8262
+  metadata.gz: 25f3dd27c99737a4cfbba700c0963f4352b7e237bf30bdea0bf9c446208906be
+  data.tar.gz: 544ee9521de65fb2cc918332e4c15ca88a89b346a021f7ca9a0bdabdb66841d5
 SHA512:
-  metadata.gz: e937c7448b783f607e851da92fa21b38c7bb44677b572e47b7f11a3ef5cc9133e76e74a1b2a13657041acfbeef89ed9240fbbe8cc606179167606cfd8fd5075a
-  data.tar.gz: 42b259f6e9d84b40a93b66d649c171b1d8a6ec84cdffc773d8871223a5de707383e3e82dfaddb4ceb76d980001cb8e1ec6096b35d29647dd298d0426460a936a
+  metadata.gz: 139f55a88e3958bfe75f687fac126219a964d15485bde0e66e264f54244cd550c4b44d284130582026090267de93693fbdcbaf2cf117166e34c0b2c62ccddc54
+  data.tar.gz: 895a8713dea2a69800fd2aa0edf8842ef20f9c9ebae86c92aff7d6c014fb5f5f90f1e689471f13918ed671f304f09fa933027bf7752bcac765aed7c3b209f28c

data/README.md

@@ -1,7 +1,6 @@
 # EnjuBiblio
-[![Travis CI](https://travis-ci.com/next-l/enju_biblio.svg?branch=1.3)](https://travis-ci.com/next-l/enju_biblio)
-[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_biblio/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_biblio?branch=1.3)
-[![security](https://hakiri.io/github/next-l/enju_biblio/1.3.svg)](https://hakiri.io/github/next-l/enju_biblio/1.3)
+[![CircleCI](https://circleci.com/gh/next-l/enju_biblio/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_biblio/tree/2.x)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_biblio/badge.svg?branch=master)](https://coveralls.io/github/next-l/enju_biblio?branch=master)
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/agents_controller.rb

@@ -227,4 +227,10 @@ class AgentsController < ApplicationController
     @languages = Language.all
     @agent_type = AgentType.where(name: 'person').first
   end
+
+  def filtered_params
+    params.permit([:view, :format, :page, :language, :sort_by, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/content_types_controller.rb

@@ -5,7 +5,7 @@ class ContentTypesController < ApplicationController
   # GET /content_types
   # GET /content_types.json
   def index
-    @content_types = ContentType.order(:position)
+    @content_types = ContentType.all
 
     respond_to do |format|
       format.html # index.html.erb

data/app/controllers/items_controller.rb

@@ -51,17 +51,6 @@ class ItemsController < ApplicationController
 
     unless @inventory_file
       search = Sunspot.new_search(Item)
-      selected_attributes = [
-        :id, :item_identifier, :call_number, :manifestation_id, :acquired_at,
-        :binding_item_identifier, :binding_call_number, :binded_at,
-        :include_supplements, :url, :note,
-        :circulation_status_id, :shelf_id,
-        :created_at, :updated_at
-      ]
-      selected_attributes += [
-        :memo, :required_role_id, :budget_type_id, :bookstore_id, :price
-      ] if current_user.try(:has_role?, 'Librarian')
-      search.data_accessor_for(Item).select = selected_attributes
       set_role_query(current_user, search)
 
       @query = query.dup
@@ -133,7 +122,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json
+      format.json { render json: @items }
       format.txt  { render layout: false }
       format.atom
     end
@@ -148,7 +137,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json
+      format.json { render json: @item }
     end
   end
 
@@ -283,11 +272,8 @@ class ItemsController < ApplicationController
       :acquired_at, :bookstore_id, :missing_since, :budget_type_id,
       :lock_version, :manifestation_id, :library_id, :required_role_id,
       :binding_item_identifier, :binding_call_number, :binded_at,
-      :use_restriction_id, :memo,
-      {item_has_use_restriction_attributes: :use_restriction_id}, # EnjuCirculation
-      {item_custom_values_attributes: [
-        :id, :item_custom_property_id, :item_id, :value,:_destroy
-      ]}
+      :use_restriction_id,
+      item_has_use_restriction_attributes: :use_restriction_id # EnjuCirculation
     )
   end
 
@@ -312,4 +298,10 @@ class ItemsController < ApplicationController
       end
     end
   end
+
+  def filtered_params
+    params.permit([:view, :format, :page, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/manifestations_controller.rb

@@ -33,14 +33,25 @@ class ManifestationsController < ApplicationController
         per_page = 65534
       end
 
-      if params[:api] == 'openurl'
-        openurl = Openurl.new(params)
-        @manifestations = openurl.search
-        query = openurl.query_text
-        sort = set_search_result_order(params[:sort_by], params[:order])
+      if params[:format] == 'sru'
+        if params[:operation] == 'searchRetrieve'
+          sru = Sru.new(params)
+          query = sru.cql.to_sunspot
+          sort = sru.sort_by
+        else
+          render template: 'manifestations/explain', layout: false
+          return
+        end
       else
-        query = make_query(params[:query], params)
-        sort = set_search_result_order(params[:sort_by], params[:order])
+        if params[:api] == 'openurl'
+          openurl = Openurl.new(params)
+          @manifestations = openurl.search
+          query = openurl.query_text
+          sort = set_search_result_order(params[:sort_by], params[:order])
+        else
+          query = make_query(params[:query], params)
+          sort = set_search_result_order(params[:sort_by], params[:order])
+        end
       end
 
       # 絞り込みを行わない状態のクエリ
@@ -180,37 +191,37 @@ class ManifestationsController < ApplicationController
       else
         per_page = Manifestation.default_per_page
       end
-
-      pub_dates = parse_pub_date(params)
-      pub_date_range = {}
-
-      if pub_dates[:from] == '*'
-        pub_date_range[:from] = 0
-      else
-        pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
-      end
-      if pub_dates[:until] == '*'
-        pub_date_range[:until] = 10000
-      else
-        pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
-      end
-
-      if params[:pub_year_range_interval]
-        pub_year_range_interval = params[:pub_year_range_interval].to_i
+      if params[:format] == 'sru'
+        #search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
       else
-        pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
-      end
+        pub_dates = parse_pub_date(params)
+        pub_date_range = {}
+        if pub_dates[:from] == '*'
+          pub_date_range[:from] = 0
+        else
+          pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
+        end
+        if pub_dates[:until] == '*'
+          pub_date_range[:until] = 10000
+        else
+          pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
+        end
+        if params[:pub_year_range_interval]
+          pub_year_range_interval = params[:pub_year_range_interval].to_i
+        else
+          pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
+        end
 
-      search.build do
-        facet :reservable if defined?(EnjuCirculation)
-        facet :carrier_type
-        facet :library
-        facet :language
-        facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
-        facet :subject_ids if defined?(EnjuSubject)
-        paginate page: page.to_i, per_page: per_page
+        search.build do
+          facet :reservable if defined?(EnjuCirculation)
+          facet :carrier_type
+          facet :library
+          facet :language
+          facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
+          facet :subject_ids if defined?(EnjuSubject)
+          paginate page: page.to_i, per_page: per_page
+        end
       end
-
       search_result = search.execute
       if @count[:query_result] > @max_number_of_results
         max_count = @max_number_of_results
@@ -250,6 +261,7 @@ class ManifestationsController < ApplicationController
       format.html
       format.html.phone
       format.xml  { render xml: @manifestations }
+      format.sru  { render layout: false }
       format.rss  { render layout: false }
       format.txt  { render layout: false }
       format.rdf  { render layout: false }
@@ -320,7 +332,7 @@ class ManifestationsController < ApplicationController
       }
       format.rdf
       format.mods
-      format.json
+      format.json { render json: @manifestation }
       format.txt
       format.js
       format.download {
@@ -343,8 +355,8 @@ class ManifestationsController < ApplicationController
   # GET /manifestations/new.json
   def new
     @manifestation = Manifestation.new
-    @manifestation.language = Language.find_by(iso_639_1: @locale)
-    @parent = Manifestation.find_by(id: params[:parent_id]) if params[:parent_id].present?
+    @manifestation.language = Language.where(iso_639_1: @locale).first
+    @parent = Manifestation.where(id: params[:parent_id]).first if params[:parent_id].present?
     if @parent
       @manifestation.parent_id = @parent.id
       [ :original_title, :title_transcription,
@@ -382,8 +394,11 @@ class ManifestationsController < ApplicationController
   # POST /manifestations
   # POST /manifestations.json
   def create
-    @manifestation = Manifestation.new(manifestation_params)
-    parent = Manifestation.find_by(id: @manifestation.parent_id)
+    creators_params = manifestation_params[:creators_attributes]
+    @manifestation = Manifestation.new(manifestation_params.delete_if{|k, v|
+      k == 'creators_attributes'
+    })
+    parent = Manifestation.where(id: @manifestation.parent_id).first
     unless @manifestation.original_title?
       @manifestation.original_title = @manifestation.attachment_file_name
     end
@@ -391,16 +406,14 @@ class ManifestationsController < ApplicationController
     respond_to do |format|
       if @manifestation.save
         Manifestation.transaction do
-          set_creators
-
-          if parent
-            parent.derived_manifestations << @manifestation
-            parent.index
-            @manifestation.index
-          end
-
-          Sunspot.commit
+          @manifestation.creators = Agent.new_agents(creators_params)
+          parent.derived_manifestations << @manifestation if parent
+        end
+        if parent
+          parent.index
+          @manifestation.index
         end
+        Sunspot.commit
 
         format.html { redirect_to @manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation')) }
         format.json { render json: @manifestation, status: :created, location: @manifestation }
@@ -415,12 +428,16 @@ class ManifestationsController < ApplicationController
   # PUT /manifestations/1
   # PUT /manifestations/1.json
   def update
-    @manifestation.assign_attributes(manifestation_params)
+    creators_params = manifestation_params[:creators_attributes]
+    Manifestation.transaction do
+      @manifestation.update(manifestation_params.delete_if{|k, v|
+        k == 'creators_attributes'
+      })
+      @manifestation.creators = Agent.new_agents(creators_params)
+    end
 
     respond_to do |format|
-      if @manifestation.save
-        set_creators
-        
+      if @manifestation.valid?
         format.html { redirect_to @manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation')) }
         format.json { head :no_content }
       else
@@ -472,7 +489,7 @@ class ManifestationsController < ApplicationController
       :valid_until, :date_submitted, :date_accepted, :date_captured,
       :ndl_bib_id, :pub_date, :edition_string, :volume_number, :issue_number,
       :serial_number, :content_type_id, :attachment, :lock_version,
-      :dimensions, :fulltext_content, :extent, :memo,
+      :dimensions, :fulltext_content, :extent,
       :parent_id,
       :serial, :statement_of_responsibility,
       {creators_attributes: [
@@ -530,9 +547,6 @@ class ManifestationsController < ApplicationController
       {identifiers_attributes: [
         :id, :body, :identifier_type_id,
         :_destroy
-      ]},
-      {manifestation_custom_values_attributes: [
-        :id, :manifestation_custom_property_id, :manifestation_id, :value,:_destroy
       ]}
     )
   end
@@ -718,12 +732,12 @@ class ManifestationsController < ApplicationController
   end
 
   def prepare_options
-    @carrier_types = CarrierType.order(:position).select([:id, :display_name, :position])
-    @content_types = ContentType.order(:position).select([:id, :display_name, :position])
-    @roles = Role.select([:id, :display_name, :position])
-    @languages = Language.order(:position).select([:id, :display_name, :position])
-    @frequencies = Frequency.order(:position).select([:id, :display_name, :position])
-    @identifier_types = IdentifierType.order(:position).select([:id, :display_name, :position])
+    @carrier_types = CarrierType.select([:id, :display_name_translations, :position])
+    @content_types = ContentType.select([:id, :display_name_translations, :position])
+    @roles = Role.select([:id, :display_name_translations, :position])
+    @languages = Language.select([:id, :display_name, :position])
+    @frequencies = Frequency.select([:id, :display_name_translations, :position])
+    @identifier_types = IdentifierType.select([:id, :display_name, :position])
     @nii_types = NiiType.select([:id, :display_name, :position]) if defined?(EnjuNii)
     if defined?(EnjuSubject)
       @subject_types = SubjectType.select([:id, :display_name, :position])
@@ -763,7 +777,7 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_from].blank?
       pub_date[:from] = "*"
     else
-      year = options[:pub_date_from].to_s.gsub(/\D/, '').rjust(4, "0")
+      year = options[:pub_date_from].rjust(4, "0")
       if year.length == 4
         pub_date[:from] = Time.zone.parse(Time.utc(year).to_s).beginning_of_year.utc.iso8601
       else
@@ -777,7 +791,7 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_until].blank?
       pub_date[:until] = "*"
     else
-      year = options[:pub_date_until].to_s.gsub(/\D/, '').rjust(4, "0")
+      year = options[:pub_date_until].rjust(4, "0")
       if year.length == 4
         pub_date[:until] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
       else
@@ -792,6 +806,8 @@ class ManifestationsController < ApplicationController
 
   def set_pub_date(query, options)
     unless options[:pub_date_from].blank? && options[:pub_date_until].blank?
+      options[:pub_date_from].to_s.gsub!(/\D/, '')
+      options[:pub_date_until].to_s.gsub!(/\D/, '')
       pub_date = parse_pub_date(options)
       query = "#{query} date_of_publication_d:[#{pub_date[:from]} TO #{pub_date[:until]}]"
     end
@@ -837,20 +853,9 @@ class ManifestationsController < ApplicationController
     query
   end
 
-  def set_creators
-    creators_params = manifestation_params[:creators_attributes]
-    contributors_params = manifestation_params[:contributors_attributes]
-    publishers_params = manifestation_params[:publishers_attributes]
-
-    Manifestation.transaction do
-      @manifestation.creates.destroy_all
-      @manifestation.realizes.destroy_all
-      @manifestation.produces.destroy_all
-      @manifestation.reload
-
-      @manifestation.creators = Agent.new_agents(creators_params)
-      @manifestation.contributors = Agent.new_agents(contributors_params)
-      @manifestation.publishers = Agent.new_agents(publishers_params)
-    end
+  def filtered_params
+    params.permit([:view, :format, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page, :query])
   end
+
+  helper_method :filtered_params
 end

data/app/controllers/resource_import_results_controller.rb

@@ -5,13 +5,9 @@ class ResourceImportResultsController < ApplicationController
   # GET /resource_import_results
   # GET /resource_import_results.json
   def index
-    @resource_import_file = ResourceImportFile.find_by(id: params[:resource_import_file_id])
+    @resource_import_file = ResourceImportFile.where(id: params[:resource_import_file_id]).first
     if @resource_import_file
-      if params[:format].to_s.downcase == 'txt'
-        @resource_import_results = @resource_import_file.resource_import_results
-      else
-        @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
-      end
+      @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
     else
       @resource_import_results = ResourceImportResult.page(params[:page])
     end

data/app/controllers/series_statements_controller.rb

@@ -133,4 +133,10 @@ class SeriesStatementsController < ApplicationController
       :series_master
     )
   end
+
+  def filtered_params
+    params.permit([:locale, :format, :page, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/helpers/enju_biblio/application_helper.rb

@@ -1,7 +1,7 @@
 module EnjuBiblio
   module ApplicationHelper
     def form_icon(carrier_type)
-      image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
+      image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name)
     rescue NoMethodError
       image_tag('icons/help.png', size: '16x16', class: 'enju_icon', alt: t('page.unknown'))
     end
@@ -9,13 +9,13 @@ module EnjuBiblio
     def content_type_icon(content_type)
       case content_type.name
       when 'text'
-        image_tag('icons/page_white_text.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name.localize)
+        image_tag('icons/page_white_text.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name)
       when 'still_image'
-        image_tag('icons/picture.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name.localize)
+        image_tag('icons/picture.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name)
       when 'sounds'
-        image_tag('icons/sound.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name.localize)
+        image_tag('icons/sound.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name)
       when 'two_dimensional_moving_image'
-        image_tag('icons/film.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name.localize)
+        image_tag('icons/film.png', size: '16x16', class: 'enju_icon', alt: content_type.display_name)
       else
         image_tag('icons/help.png', size: '16x16', class: 'enju_icon', alt: t('page.unknown'))
       end

data/app/helpers/manifestations_helper.rb

@@ -2,7 +2,7 @@ module ManifestationsHelper
   include EnjuCirculation::ManifestationsHelper if defined?(EnjuCirculation)
 
   def resource_title(manifestation, action)
-    string = LibraryGroup.site_config.display_name.localize.dup
+    string = LibraryGroup.site_config.display_name.dup
     unless action == ('index' or 'new')
       if manifestation.try(:original_title)
         string << ' - ' + manifestation.original_title.to_s
@@ -40,7 +40,7 @@ module ManifestationsHelper
   def language_list(languages)
     list = []
     languages.each do |language|
-      list << language.display_name.localize if language.name != 'unknown'
+      list << language.display_name if language.name != 'unknown'
     end
     list.join("; ")
   end
@@ -71,41 +71,41 @@ module ManifestationsHelper
     current = true if languages.include?(language.name)
     if current
       content_tag :strong do
-        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, language: language.name, view: nil, only_path: true)))
+        link_to("#{language.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, language: language.name, view: nil, only_path: true)))
       end
     else
-      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, language: language.name, view: nil, only_path: true)))
+      link_to("#{language.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, language: language.name, view: nil, only_path: true)))
     end
   end
 
   def library_facet(current_libraries, facet)
-    library = Library.where(name: facet.value).select([:name, :display_name]).first
+    library = Library.where(name: facet.value).select([:name, :display_name_translations]).first
     return nil unless library
     string = ''
     current = true if current_libraries.include?(library.name)
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
+          link_to("#{library.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
         end
       else
-        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
+        link_to("#{library.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
       end
     end
   end
 
   def carrier_type_facet(facet)
     string = ''
-    carrier_type = CarrierType.where(name: facet.value).select([:id, :name, :display_name]).first
+    carrier_type = CarrierType.where(name: facet.value).select([:id, :name, :display_name_translations]).first
     if carrier_type
       string << form_icon(carrier_type)
       current = true if params[:carrier_type] == carrier_type.name
       if current
         content_tag :strong do
-          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
+          link_to("#{carrier_type.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(request.params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
+        link_to("#{carrier_type.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
       end
     end
   end
@@ -115,10 +115,10 @@ module ManifestationsHelper
     current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_until.to_i
     if current
       content_tag :strong do
-        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(request.params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(filtered_params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
       end
     else
-      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(request.params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(filtered_params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 

data/app/models/agent.rb

@@ -17,7 +17,7 @@ class Agent < ApplicationRecord
   has_many :derived_agents, through: :children, source: :child
   has_many :original_agents, through: :parents, source: :parent
   has_many :picture_files, as: :picture_attachable, dependent: :destroy
-  has_many :donates, dependent: :destroy
+  has_many :donates
   has_many :donated_items, through: :donates, source: :item
   has_many :owns, dependent: :destroy
   has_many :items, through: :owns
@@ -97,7 +97,7 @@ class Agent < ApplicationRecord
   def set_date_of_birth
     return if birth_date.blank?
     begin
-      date = Time.zone.parse(birth_date.to_s)
+      date = Time.zone.parse("#{birth_date}")
     rescue ArgumentError
       begin
         date = Time.zone.parse("#{birth_date}-01")
@@ -115,7 +115,7 @@ class Agent < ApplicationRecord
   def set_date_of_death
     return if death_date.blank?
     begin
-      date = Time.zone.parse(death_date.to_s)
+      date = Time.zone.parse("#{death_date}")
     rescue ArgumentError
       begin
         date = Time.zone.parse("#{death_date}-01")
@@ -256,26 +256,17 @@ class Agent < ApplicationRecord
     Agent.transaction do
       agents_params.each do |k, v|
         next if v['_destroy'] == '1'
-
-        agent = nil
-
         if v['agent_id'].present?
           agent = Agent.find(v['agent_id'])
         elsif v['id'].present?
           agent = Agent.find(v['id'])
-        end
-
-        if !agent or agent.full_name != v['full_name']
-          v.delete('id')
-          v.delete('agent_id')
+        else
           v.delete('_destroy')
           agent = Agent.create(v)
         end
-
         agents << agent
       end
     end
-
     agents
   end
 end

data/app/models/agent_import_file.rb

@@ -151,7 +151,7 @@ class AgentImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      agent = Agent.find_by(id: row['id'].to_s.strip)
+      agent = Agent.where(id: row['id'].to_s.strip).first
       if agent
         agent.picture_files.destroy_all
         agent.reload

data/app/models/agent_relationship_type.rb

@@ -8,11 +8,12 @@ end
 #
 # Table name: agent_relationship_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/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
 #