s3_migration 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e5306758296ed3929c545d4607b6e05e439ffb274df1a4bb6f5af23b9ad803
-  data.tar.gz: 9b0c6999c349179acf6e3da35608510442efdf67863950af29387f5e6f217d8c
+  metadata.gz: 3d0c1aad0021835d5ff8465192330a126687faed7599bfbd80b470bc856d3545
+  data.tar.gz: 857093deac26f2df2c9deb46c32f42f5cc99fac772bdf892333a2afd170280ca
 SHA512:
-  metadata.gz: e74181493a0e761de5be0376a20f4f40dc8916b0bda396e72073b4c3c9463cd04f36443fc7fd635983882d8cff43fdd5b3c61d696fa383ffa3321baf9912b4b3
-  data.tar.gz: 49aaf2bf5292519ab484b0b44ea2b679a323ba5d99a7b2b28c609fd3af8a7490bbb22cf4e1e36cef62c20554d9c47bf71b90d425ed1848b918185e03c2635f41
+  metadata.gz: 29a5c98a1d1fe1f234f2b7b634825ebebe33e4fc67f874122cd442ee18da4296f4b42c32c39ff41a5194b8062bef7d4e7077ffba3c13d8bd1074574274f7cb62
+  data.tar.gz: eb01c4628148b16461a2734edb677b1940f41e1427d34bdbd16657dbd0d1c4d6c21ac5714fc7be20a1eb9f563c917bd86b5aa5f5677ad36204b53986e7960970

data/lib/s3_migration/file_migrator.rb

@@ -99,7 +99,7 @@ module S3Migration
     end
 
     def switch_identifier(uploaded, disk_sha256)
-      current = Hyrax.query_service.find_by(id: original.id)
+      current = S3Migration.find_resource(original.id)
       unless SourceStorage.handles?(current.file_identifier)
         return result(:raced, 'already migrated by another process')
       end

data/lib/s3_migration/migrate_file_set_job.rb

@@ -8,8 +8,8 @@ module S3Migration
     retry_on StandardError, wait: :polynomially_longer, attempts: 5
 
     def perform(file_set_id, dry_run: false)
-      file_set = Hyrax.query_service.find_by(id: file_set_id)
-      original = Hyrax.custom_queries.find_original_file(file_set:)
+      file_set = S3Migration.find_file_set(file_set_id)
+      original = S3Migration.find_original_file(file_set:)
       return unless original
 
       result = S3Migration::FileMigrator.new(file_set:, original:, dry_run:).call

data/lib/s3_migration/quarantine.rb

@@ -98,7 +98,7 @@ module S3Migration
     end
 
     def current
-      @current ||= Hyrax.query_service.find_by(id: entry[:file_metadata_id])
+      @current ||= S3Migration.find_resource(entry[:file_metadata_id])
     end
 
     def current_identifier

data/lib/s3_migration/storage_report.rb

@@ -26,7 +26,7 @@ module S3Migration
     end
 
     def self.files_for(file_set)
-      Hyrax.custom_queries.find_files(file_set:)
+      S3Migration.find_files(file_set:)
     rescue Valkyrie::Persistence::ObjectNotFoundError
       nil
     end

data/lib/s3_migration/upload_cleanup.rb

@@ -26,7 +26,7 @@ module S3Migration
 
     # When the database cannot be read, keep the upload: the manifest entry still points at it.
     def referenced?(upload_id)
-      Hyrax.query_service.find_by(id: file_metadata_id).file_identifier == upload_id
+      S3Migration.find_resource(file_metadata_id).file_identifier == upload_id
     rescue StandardError
       true
     end

data/lib/s3_migration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module S3Migration
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/s3_migration.rb

@@ -58,12 +58,41 @@ module S3Migration
     end
 
     def original_for(file_set, on_error: nil)
-      Hyrax.custom_queries.find_original_file(file_set:)
+      find_original_file(file_set:)
     rescue StandardError => e
       on_error&.call(file_set, e)
       nil
     end
 
+    # The lookups below ask only the non-Wings services. The composite ones also ask Wings, and a miss there
+    # reaches Fedora, which can hang (and ActiveFedora may try to create the tenant's base container).
+    def find_resource(id)
+      each_service_result { |service| service.find_by(id:) }.first || raise(Valkyrie::Persistence::ObjectNotFoundError)
+    end
+    alias find_file_set find_resource
+
+    def find_files(file_set:)
+      each_service_result { |service| service.custom_queries.find_files(file_set:).to_a }.flatten
+    end
+
+    def find_original_file(file_set:)
+      each_service_result { |service| service.custom_queries.find_original_file(file_set:) }.first
+    end
+
+    # Each service's non-nil result; raises ObjectNotFoundError only when every service raised it.
+    def each_service_result
+      errors = []
+      results = query_services.filter_map do |service|
+        yield service
+      rescue Valkyrie::Persistence::ObjectNotFoundError => e
+        errors << e
+        nil
+      end
+      raise errors.first if results.empty? && errors.any?
+
+      results
+    end
+
     def query_services
       service = Hyrax.query_service
       services = service.respond_to?(:services) ? service.services : [service]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_migration
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Max Kadel