Merge pull request #1580 from projectblacklight/rm-legacy-parent-ids

Remove deprecated legacy_parent_ids

Author: jcoyne

app/models/arclight/parents.rb

@@ -5,11 +5,10 @@ module Arclight
   # Object for parsing and formalizing Solr_Ead "Parents"
   # https://github.com/awead/solr_ead/blob/8cf7ffaa66e0e4c9c0b12f5646d6c2e20984cd99/lib/solr_ead/behaviors.rb#L54-L57
   class Parents
-    attr_reader :ids, :legacy_ids, :labels, :levels
+    attr_reader :ids, :labels, :levels
 
-    def initialize(ids:, legacy_ids:, labels:, eadid:, levels:)
+    def initialize(ids:, labels:, eadid:, levels:)
       @ids = ids
-      @legacy_ids = legacy_ids
       @labels = labels
       @eadid = eadid
       @levels = levels
@@ -22,18 +21,17 @@ def eadid
     ##
     # @return [Array[Arclight::Parent]]
     def as_parents
-      (ids.presence || legacy_ids).map.with_index { |id, idx| Arclight::Parent.new(id: id, label: labels[idx], eadid: eadid, level: levels[idx]) }
+      ids.map.with_index { |id, idx| Arclight::Parent.new(id: id, label: labels[idx], eadid: eadid, level: levels[idx]) }
     end
 
     ##
     # @param [SolrDocument] document
     def self.from_solr_document(document)
       ids = document.parent_ids
-      legacy_ids = document.legacy_parent_ids.map { |legacy_id| document.collection_id == legacy_id ? legacy_id : "#{document.collection_id}#{legacy_id}" }
       labels = document.parent_labels
       eadid = document.eadid
       levels = document.parent_levels
-      new(ids: ids, legacy_ids: legacy_ids, labels: labels, eadid: eadid, levels: levels)
+      new(ids: ids, labels: labels, eadid: eadid, levels: levels)
     end
   end
 end

app/models/concerns/arclight/solr_document.rb

@@ -9,8 +9,6 @@ module SolrDocument
     included do
       attribute :collection_id, :string, '_root_'
       attribute :parent_ids, :array, 'parent_ids_ssim'
-      attribute :legacy_parent_ids, :array, 'parent_ssim'
-      Arclight.deprecation.deprecate_methods(self, legacy_parent_ids: 'Use `parent_ids` instead')
       attribute :parent_labels, :array, 'parent_unittitles_ssm'
       attribute :parent_levels, :array, 'parent_levels_ssm'
       attribute :unitid, :string, 'unitid_ssm'

lib/arclight/traject/ead2_component_config.rb

@@ -130,11 +130,6 @@
   accumulator << (settings[:depth] || 1)
 end
 
-to_field 'parent_ssim' do |_record, accumulator, _context|
-  accumulator.concat(settings[:parent].output_hash['parent_ssim'] || [])
-  accumulator.concat settings[:parent].output_hash['ref_ssi'] || settings[:parent].output_hash['id']
-end
-
 to_field 'parent_ssi' do |_record, accumulator, _context|
   accumulator.concat settings[:parent].output_hash['ref_ssi'] || settings[:parent].output_hash['id']
 end

spec/components/arclight/breadcrumb_component_spec.rb

@@ -56,23 +56,4 @@
     expect(rendered).to have_link 'DEF', href: '/catalog/abc123_def'
     expect(rendered).to have_link 'GHI', href: '/catalog/abc123_ghi'
   end
-
-  context 'with legacy parent_ssm data' do
-    let(:legacy_document) do
-      SolrDocument.new(
-        parent_ssim: %w[abc123 def ghi],
-        parent_unittitles_ssm: %w[ABC123 DEF GHI],
-        ead_ssi: 'abc123',
-        repository_ssm: 'my repository',
-        _root_: 'abc123'
-      )
-    end
-
-    let(:component) { described_class.new(document: legacy_document, **attr) }
-
-    it 'renders breadcrumb links' do
-      expect(rendered).to have_link 'DEF', href: '/catalog/abc123def'
-      expect(rendered).to have_link 'GHI', href: '/catalog/abc123ghi'
-    end
-  end
 end

spec/features/traject/ead2_indexing_spec.rb

@@ -239,8 +239,8 @@ def components(result)
       )
 
       expect(nested_component['component_level_isim']).to eq [2]
-      expect(nested_component['parent_ssim']).to eq %w[lc0100 aspace_327a75c226d44aa1a769edb4d2f13c6e]
       expect(nested_component['parent_ssi']).to eq ['aspace_327a75c226d44aa1a769edb4d2f13c6e']
+      expect(nested_component['parent_ids_ssim']).to eq %w[lc0100 lc0100_aspace_327a75c226d44aa1a769edb4d2f13c6e]
       expect(nested_component['parent_unittitles_ssm']).to eq ['Large collection sample, 1843-1872', 'File 1']
     end
   end
@@ -449,10 +449,10 @@ def components(result)
         end
 
         it 'parents are correctly ordered' do
-          expect(component_with_many_parents['parent_ssim']).to eq %w[
+          expect(component_with_many_parents['parent_ids_ssim']).to eq %w[
             aoa271
-            aspace_563a320bb37d24a9e1e6f7bf95b52671
-            aspace_238a0567431f36f49acea49ef576d408
+            aoa271_aspace_563a320bb37d24a9e1e6f7bf95b52671
+            aoa271_aspace_238a0567431f36f49acea49ef576d408
           ]
         end
 
@@ -688,8 +688,8 @@ def components(result)
       expect(second_component['ref_ssi']).to contain_exactly('al_54b06e5ad77cab05ec7f6beeaca50022c47d9c7b')
       expect(second_component['id']).to contain_exactly('ehllHemingwayErnest-sample_al_54b06e5ad77cab05ec7f6beeaca50022c47d9c7b')
 
-      expect(second_component['parent_ssim']).to equal_array_ignoring_whitespace(
-        %w[ehllHemingwayErnest-sample al_4bf70b448ac8351a147acff1dd8b1c0b9a791980]
+      expect(second_component['parent_ids_ssim']).to equal_array_ignoring_whitespace(
+        %w[ehllHemingwayErnest-sample ehllHemingwayErnest-sample_al_4bf70b448ac8351a147acff1dd8b1c0b9a791980]
       )
     end
   end

spec/models/arclight/parents_spec.rb

@@ -13,16 +13,6 @@
     )
   end
 
-  let(:legacy_parent_ids_doc) do
-    SolrDocument.new(
-      parent_ssim: %w[abc123 def ghi],
-      parent_unittitles_ssm: %w[ABC123 DEF GHI],
-      ead_ssi: 'abc123',
-      _root_: 'abc123',
-      parent_levels_ssm: %w[collection]
-    )
-  end
-
   let(:dot_eadid_doc) do
     SolrDocument.new(
       parent_ids_ssim: %w[abc123-xml abc123-xml_def abc123-xml_ghi],
@@ -35,7 +25,6 @@
   let(:empty_document) { SolrDocument.new }
   let(:good_instance) { described_class.from_solr_document(document) }
   let(:dot_eadid_instance) { described_class.from_solr_document(dot_eadid_doc) }
-  let(:legacy_parent_ids_instance) { described_class.from_solr_document(legacy_parent_ids_doc) }
 
   describe '.from_solr_document' do
     context 'with good data' do
@@ -45,7 +34,6 @@
 
       it 'values are appropriately set' do
         expect(good_instance.ids).to eq %w[abc123 abc123_def abc123_ghi]
-        expect(good_instance.legacy_ids).to be_empty
         expect(good_instance.labels).to eq %w[ABC123 DEF GHI]
         expect(good_instance.eadid).to eq 'abc123'
         expect(good_instance.levels).to eq %w[collection]
@@ -56,13 +44,6 @@
       end
     end
 
-    context 'with legacy parent_ssim data' do
-      it 'id values are appropriately set' do
-        expect(legacy_parent_ids_instance.ids).to be_empty
-        expect(legacy_parent_ids_instance.legacy_ids).to eq %w[abc123 abc123def abc123ghi]
-      end
-    end
-
     context 'with no data' do
       it 'returns an instance of itself' do
         expect(described_class.from_solr_document(empty_document)).to be_an described_class
@@ -92,16 +73,9 @@
       end
     end
 
-    context 'with legacy parent_ssim data' do
-      it 'the containing parents have the correct data' do
-        expect(legacy_parent_ids_instance.as_parents.first.id).to eq 'abc123'
-        expect(legacy_parent_ids_instance.as_parents.last.id).to eq 'abc123ghi'
-      end
-    end
-
     context 'with no data' do
       it 'returns an empty array' do
-        expect(described_class.new(ids: [], legacy_ids: [], labels: [], eadid: '', levels: '').as_parents).to eq []
+        expect(described_class.new(ids: [], labels: [], eadid: '', levels: '').as_parents).to eq []
       end
     end
   end

spec/models/concerns/arclight/solr_document_spec.rb

@@ -6,7 +6,6 @@
   let(:document) { SolrDocument.new(id: '123') }
 
   describe 'custom accessors' do
-    it { expect(document).to respond_to(:legacy_parent_ids) }
     it { expect(document).to respond_to(:parent_ids) }
     it { expect(document).to respond_to(:parent_labels) }
     it { expect(document).to respond_to(:eadid) }