Merge pull request #1031 from sul-dlss/doi-public-xml

Prevent duplicate DOI identifiers in public XML

Author: jcoyne

app/services/publish/public_desc_metadata_service.rb

@@ -57,11 +57,17 @@ def strip_comments!
     def add_doi
       return unless cocina_object.dro? && cocina_object.identification.doi
 
-      identifier = doc.create_element('identifier', xmlns: MODS_NS)
-      identifier.content = "https://doi.org/#{cocina_object.identification.doi}"
-      identifier['type'] = 'doi'
-      identifier['displayLabel'] = 'DOI'
-      doc.root << identifier
+      doi_node = doc.xpath('/xmlns:mods/xmlns:identifier[@type="doi"]').first
+      if doi_node
+        doi_node['displayLabel'] = 'DOI'
+        doi_node.content = "https://doi.org/#{doi_node.content}" unless doi_node.content.starts_with?('https')
+      else
+        identifier = doc.create_element('identifier', xmlns: MODS_NS)
+        identifier.content = "https://doi.org/#{cocina_object.identification.doi}"
+        identifier['type'] = 'doi'
+        identifier['displayLabel'] = 'DOI'
+        doc.root << identifier
+      end
     end
 
     # expand constituent relations into relatedItem references -- see JUMBO-18

spec/requests/v1/publish_collection_spec.rb

@@ -23,6 +23,10 @@
     end
 
     context 'when using the legacy endpoint' do
+      after do
+        FileUtils.rm_rf(Settings.filesystems.stacks_root)
+      end
+
       it 'does not fail' do
         post "/v1/resources",
              params: request,

spec/services/publish/public_desc_metadata_service_spec.rb

@@ -10,7 +10,7 @@
   let(:cocina) do
     Cocina::Models.build({
                            type: "https://cocina.sul.stanford.edu/models/book",
-                           externalIdentifier: "druid:bc123df4567",
+                           externalIdentifier: druid,
                            label: "Test DRO",
                            version: 1,
                            access:,
@@ -20,6 +20,7 @@
                            structural:
                          })
   end
+  let(:druid) { "druid:bc123df4567" }
 
   let(:access) { {} }
   let(:identification) { { sourceId: 'sul:123' } }
@@ -151,7 +152,25 @@
       service.ng_xml
     end
 
-    it 'adds the doi in identityMetadata' do
+    let(:description) do
+      {
+        title: [{ value: 'Best Thesis Ever' }],
+        purl: 'https://purl.stanford.edu/ty606df5808',
+        identifier: [
+          {
+            value: '10.80343/ty606df5808',
+            type: 'DOI',
+            source: {
+              code: 'doi'
+            }
+          }
+        ]
+      }
+    end
+
+    let(:druid) { "druid:ty606df5808" }
+
+    it 'adds the doi to mods:identifier' do
       expect(public_mods.xpath('//xmlns:identifier[@type="doi"]').to_xml).to eq(
         '<identifier type="doi" displayLabel="DOI">https://doi.org/10.80343/ty606df5808</identifier>'
       )