Differentiate between the two kinds of PDC Discovery URLs we use (#1446)

app/models/work.rb

@@ -541,6 +541,13 @@ def has_rights?(rights_id)
     resource.rights_many.index { |rights| rights.identifier == rights_id } != nil
   end
 
+  # This is the solr id / work show page in PDC Discovery
+  def pdc_discovery_url
+    "https://datacommons.princeton.edu/discovery/catalog/doi-#{doi.tr('/', '-').tr('.', '-')}"
+  end
+
+  # This is the url that should be used for ARK and DOI redirection. It will search the
+  # index for the DOI and redirect the use appropriately.
   def doi_attribute_url
     "https://datacommons.princeton.edu/discovery/doi/#{doi}"
   end

app/views/works/show.html.erb

@@ -200,7 +200,7 @@
       <% if @work.resource.doi %>
         <dt>Discovery URL</dt>
         <dd>
-          <%= link_to(@work.doi_attribute_url, @work.doi_attribute_url) %>
+          <%= link_to(@work.pdc_discovery_url, @work.pdc_discovery_url) %>
         </dd>
       <% end %>
 

spec/models/work_spec.rb

@@ -104,6 +104,13 @@
     expect { work.state = "sorry" }.to raise_error(StandardError, /Invalid state 'sorry'/)
   end
 
+  it "calculates the urls that PDC discovery will use" do
+    # this is the actual PDC Discovery URL
+    expect(work.pdc_discovery_url).to eq "https://datacommons.princeton.edu/discovery/catalog/doi-10-34770-123-abc"
+    # this also works, but will cause PDC Discovery to search by the DOI
+    expect(work.doi_attribute_url).to eq "https://datacommons.princeton.edu/discovery/doi/10.34770/123-abc"
+  end
+
   describe "#editable_by?" do
     subject(:work) { FactoryBot.create(:tokamak_work) }
     let(:submitter) { work.created_by_user }

spec/system/work_show_spec.rb

@@ -62,7 +62,7 @@
   it "shows the PDC Discovery URL" do
     sign_in user
     visit work_path(work)
-    expect(page).to have_link("https://datacommons.princeton.edu/discovery/doi/10.34770/r2dz-ys12")
+    expect(page).to have_link("https://datacommons.princeton.edu/discovery/catalog/doi-10-34770-r2dz-ys12")
   end
 
   it "copies DOI to the clipboard" do