Fix/preflightchecks (#1495)

lib/hyrax/migrator/crosswalk_metadata.rb

@@ -41,7 +41,7 @@ def assemble_hash(data, object)
     end
 
     def find(predicate)
-      proc { |k| k[:predicate].casecmp(predicate).zero? }
+      proc { |k| k[:predicate] == predicate }
     end
 
     # Given an OD2 predicate, returns associated property data or nil

lib/hyrax/migrator/preflight_checks.rb

@@ -79,7 +79,7 @@ def cpds?
 
     def visibility?
       result = @results.delete :visibility
-      @counters[:visibility] += 1 unless result.value? 'open'
+      @counters[:visibility] += 1 unless result.include? 'open'
       return unless result.include? 'error'
 
       concat_errors(result)

lib/hyrax/migrator/visibility_lookup.rb

@@ -5,42 +5,12 @@
 module Hyrax::Migrator
   # A class to inspect the metadata and crosswalk the type to a model used for migration
   class VisibilityLookup
+    include Hyrax::Migrator::VisibilityMethods
     def lookup_visibility
       result = lookup(read_groups)
       return result if comparison_check(result)
 
       nil
     end
-
-    private
-
-    # this should provide access to the read_groups metadata
-    # in preflight, use the item
-    # in the migrator use the workflow metadata
-    def read_groups; end
-
-    #  metadata field on asset.
-    # in preflight, use descMetadata
-    # in migrator, use work env attributes
-    def access_restrictions; end
-
-    def lookup(groups)
-      if groups.include? 'public'
-        { visibility: 'open' }
-      elsif (groups.include? 'University-of-Oregon') || (groups.include? 'Oregon-State')
-        { visibility: 'authenticated' }
-      else
-        { visibility: 'restricted' }
-      end
-    end
-
-    def comparison_check(visibility)
-      unless access_restrictions.blank?
-        return true if visibility[:visibility] == 'authenticated'
-
-        return false
-      end
-      true
-    end
   end
 end

lib/hyrax/migrator/visibility_lookup_preflight.rb

@@ -9,10 +9,10 @@ class VisibilityLookupPreflight < Hyrax::Migrator::VisibilityLookup
     attr_accessor :work
 
     def lookup_visibility
-      result = lookup(read_groups)
-      return 'error: read_groups does not agree with access_restrictions' unless comparison_check(result)
+      result = super
+      return result[:visibility] unless result.nil?
 
-      result
+      'error: read_groups does not agree with access_restrictions'
     end
 
     private

lib/hyrax/migrator/visibility_methods.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal:true
+
+module Hyrax::Migrator
+  # methods for Visibility lookup services
+  module VisibilityMethods
+    # this should provide access to the read_groups metadata
+    # in preflight, use the item
+    # in the migrator use the workflow metadata
+    def read_groups; end
+
+    #  metadata field on asset.
+    # in preflight, use descMetadata
+    # in migrator, use work env attributes
+    def access_restrictions; end
+
+    def lookup(groups)
+      if groups.include? 'public'
+        { visibility: 'open' }
+      elsif groups.include? 'University-of-Oregon'
+        { visibility: 'uo' }
+      elsif groups.include? 'Oregon-State'
+        { visibility: 'osu' }
+      else
+        { visibility: 'restricted' }
+      end
+    end
+
+    def comparison_check(visibility)
+      unless access_restrictions.blank?
+        return true if visibility[:visibility] != 'open'
+
+        return false
+      end
+      true
+    end
+  end
+end