Merge pull request #3370 from mlibrary/aptrust-api-v3

HELIO-4322 update APtrust API usage to V3
mlibrary · Nov 15, 2022 · 5b70f6e · 5b70f6e
2 parents e119ce3 + 83ad306
commit 5b70f6e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/jobs/aptrust_deposit_job.rb b/app/jobs/aptrust_deposit_job.rb
@@ -51,7 +51,13 @@ def bag(monograph)
     Export::Exporter.new(monograph.noid).extract("#{bag.bag_dir}/data/", true)
 
     # Create manifests
-    bag.manifest!
+    bag.manifest!(algo: 'md5')
+    # HELIO-4380 demo.aptrust.org doesn't like this file for some reason, gives an ingest error:
+    # "Bag contains illegal tag manifest 'sha1'""
+    # APTrust only wants SHA256, or MD5, not SHA1.
+    # 'tagmanifest-sha1.txt' is a bagit gem default, so we need to remove it manually.
+    sha1tag = File.join(bag.bag_dir, 'tagmanifest-sha1.txt')
+    File.delete(sha1tag) if File.exist?(sha1tag)
 
     dirname
   end

diff --git a/app/services/aptrust/service.rb b/app/services/aptrust/service.rb
@@ -3,13 +3,15 @@
 module Aptrust
   class Service
     def ingest_status(identifier) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      response = connection.get("items?object_identifier_like=#{identifier}&item_action=Ingest")
+      # For API V3 we need identifiers that look like fulcrum.org/fulcrum.org.michelt-zc77ss45g
+      # and not just fulcrum.org.michelt-zc77ss45g
+      response = connection.get("items?object_identifier=fulcrum.org\/#{identifier}&action=Ingest")
 
       return 'http_error' unless response.success?
 
       results = response.body['results']
 
-      return 'not_found' if results.empty?
+      return 'not_found' if results.blank?
 
       item = results.first
 

diff --git a/spec/services/aptrust/service_spec.rb b/spec/services/aptrust/service_spec.rb
@@ -44,7 +44,7 @@
     let(:body) { { "results" => items } }
     let(:items) { [] }
 
-    before { allow(connection).to receive(:get).with("items?object_identifier_like=#{identifier}&item_action=Ingest").and_return(response) }
+    before { allow(connection).to receive(:get).with("items?object_identifier=fulcrum.org\/#{identifier}&action=Ingest").and_return(response) }
 
     it { is_expected.to eq('http_error') }
 
@@ -71,7 +71,7 @@
             it { is_expected.to eq('success') }
 
             context 'standard error' do
-              before { allow(connection).to receive(:get).with("items?object_identifier_like=#{identifier}&item_action=Ingest").and_raise(StandardError) }
+              before { allow(connection).to receive(:get).with("items?object_identifier=fulcrum.org\/#{identifier}&action=Ingest").and_raise(StandardError) }
 
               it { is_expected.to eq('standard_error') }
             end