fix: Archival Collection (#959)

* add or instead or and

* update the archival_collection method

* fux trailing whitespace

* revert catalog controller

* revert californica_collection_presenter work_presenter

* update the mmethod to fix the punctuation

* add rubocop exception

* fix linting

.rubocop.yml

@@ -20,6 +20,7 @@ Metrics/AbcSize:
     - app/importers/collection_record_importer.rb
     - spec/jobs/mss_csv_import_job_spec.rb
     - app/jobs/csv_row_import_job.rb
+    - app/indexers/work_indexer.rb
 
 Metrics/ClassLength:
   Enabled: true
@@ -66,6 +67,7 @@ Metrics/CyclomaticComplexity:
     - app/uploaders/csv_manifest_validator.rb
     - app/indexers/year_parser.rb
     - app/jobs/csv_row_import_job.rb
+    - app/indexers/work_indexer.rb
 
 Metrics/LineLength:
   Exclude:
@@ -116,6 +118,7 @@ Metrics/PerceivedComplexity:
     - app/controllers/application_controller.rb
     - app/indexers/year_parser.rb
     - app/jobs/csv_row_import_job.rb
+    - app/indexers/work_indexer.rb
 
 RSpec/AnyInstance:
   Enabled: false
@@ -165,6 +168,10 @@ Style/IfUnlessModifier:
   Exclude:
     - 'app/importers/csv_validator.rb'
 
+Style/UnneededInterpolation:
+  Exclude:
+    - 'app/indexers/work_indexer.rb'
+
 Layout/MultilineBlockLayout:
   Exclude:
     - 'spec/system/search_catalog_spec.rb'
@@ -177,6 +184,10 @@ Layout/BlockEndNewline:
   Exclude:
     - 'spec/system/search_catalog_spec.rb'
 
+Layout/IndentArray:
+  Exclude:
+    - 'spec/indexers/work_indexer_spec.rb'
+
 Rails/SkipsModelValidations:
   Exclude:
     - 'app/importers/californica_importer.rb'

app/indexers/work_indexer.rb

@@ -166,8 +166,24 @@ def solr_dates
   end
 
   def archival_collection
-    if object.archival_collection_title && object.archival_collection_number && object.archival_collection_box && object.archival_collection_folder
-      "#{object.archival_collection_title} (#{object.archival_collection_number}), #{object.archival_collection_box}, #{object.archival_collection_folder}"
+    # Return nil if none of the attributes exist.
+    return nil unless object.archival_collection_title.present? || object.archival_collection_number.present? || object.archival_collection_box.present? || object.archival_collection_folder.present?
+
+    parts = []
+    # Start with the title, if it exists.
+    parts << object.archival_collection_title if object.archival_collection_title.present?
+
+    # Add the number in parentheses directly following the title, if it exists.
+    if object.archival_collection_number.present?
+      title_with_number = parts.last ? "#{parts.pop} (#{object.archival_collection_number})" : "(#{object.archival_collection_number})"
+      parts << title_with_number
     end
+
+    # Add the box and folder information, prefixed appropriately, if they exist.
+    parts << "#{object.archival_collection_box}" if object.archival_collection_box.present?
+    parts << "#{object.archival_collection_folder}" if object.archival_collection_folder.present?
+
+    # Join the parts with a comma a space, where appropriate.
+    parts.join(', ')
   end
 end

spec/indexers/work_indexer_spec.rb

@@ -114,10 +114,10 @@
 
       it 'indexes a human-readable related record title text' do
         expect(solr_document['human_readable_related_record_title_ssm']).to match_array([
-                                                                                          "<a href='http://localhost:3003/catalog/ark:/123/458'>title 3 for ark:/123/458</a>",
-                                                                                          "<a href='http://localhost:3003/catalog/ark:/123/457'>title 2 for ark:/123/457</a>",
-                                                                                          "<a href='http://localhost:3003/catalog/ark:/123/459'>title 1 for ark:/123/459</a>"
-                                                                                        ])
+          "<a href='http://localhost:3003/catalog/ark:/123/458'>title 3 for ark:/123/458</a>",
+          "<a href='http://localhost:3003/catalog/ark:/123/457'>title 2 for ark:/123/457</a>",
+          "<a href='http://localhost:3003/catalog/ark:/123/459'>title 1 for ark:/123/459</a>"
+        ])
       end
     end
   end
@@ -571,6 +571,35 @@
       end
     end
 
+    context 'when just archival collection title & number attributes are provided' do
+      let(:attributes) do
+        {
+          ark: 'ark:/123/456',
+          archival_collection_title: "Sample collection",
+          archival_collection_number: "Collection 123"
+        }
+      end
+
+      it 'combines them' do
+        expect(indexer.archival_collection).to eq "Sample collection (Collection 123)"
+      end
+    end
+
+    context 'when just archival collection title, box & folder attributes are provided' do
+      let(:attributes) do
+        {
+          ark: 'ark:/123/456',
+          archival_collection_title: "Sample collection",
+          archival_collection_box: "Box 9",
+          archival_collection_folder: "Folder 21"
+        }
+      end
+
+      it 'combines them' do
+        expect(indexer.archival_collection).to eq "Sample collection, Box 9, Folder 21"
+      end
+    end
+
     context 'when archival collection attributes are absent' do
       let(:attributes) do
         {