Merge 5e183bd into b76fc88

hydra-access-controls/app/services/hydra/embargo_service.rb

@@ -14,7 +14,7 @@ def assets_with_expired_embargoes
       #   (assumes that when lease visibility is applied to assets
       #    whose leases have expired, the lease expiration date will be removed from its metadata)
       def assets_under_embargo
-        ActiveFedora::Base.where("#{Hydra.config.permissions.embargo.release_date}:*")
+        ActiveFedora::Base.where("#{Hydra.config.permissions.embargo.release_date}:[* TO *]")
       end
 
       # Returns all assets that have had embargoes deactivated in the past.

hydra-access-controls/app/services/hydra/lease_service.rb

@@ -10,7 +10,7 @@ def assets_with_expired_leases
       #   (assumes that when lease visibility is applied to assets
       #    whose leases have expired, the lease expiration date will be removed from its metadata)
       def assets_under_lease
-        ActiveFedora::Base.where("#{Hydra.config.permissions.lease.expiration_date}:*")
+        ActiveFedora::Base.where("#{Hydra.config.permissions.lease.expiration_date}:[* TO *]")
       end
 
       # Returns all assets that have had embargoes deactivated in the past.
@@ -20,4 +20,3 @@ def assets_with_deactivated_leases
     end
   end
 end
-

hydra-access-controls/spec/services/embargo_service_spec.rb

@@ -29,7 +29,6 @@
 
   describe "#assets_under_embargo" do
     it "returns all assets with embargo release date set" do
-      result = subject.assets_under_embargo
       returned_ids = subject.assets_under_embargo.map {|a| a.id}
       expect(returned_ids).to include work_with_expired_embargo1.id, work_with_expired_embargo2.id, work_with_embargo_in_effect.id
       expect(returned_ids).to_not include work_without_embargo.id