dor-services 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136d61d182d9ce8c75cd211f5b1d76c5a27f7db15811939718ecf4257a025a9b
-  data.tar.gz: ddb8aaab834a7c7c78fe7da5388127bd8978740ac9fa5b59e1b25a34b6c0aca4
+  metadata.gz: b8ac9ba1a6c0a0bd8643b8048d2fa51dbacb9a03265490a5f020c3e5cbe782c9
+  data.tar.gz: e76c0f0db482f2c20c328fa2a26fb3e82fc6cf3c8c818a5befb49476c0a95f41
 SHA512:
-  metadata.gz: 904c66a42965b98fa202d6044d2e82557a673f520fb06d011dcc3e40a4d42ed5ccf0eeadf725743066b7087a664da0567a7cf0fb7ea0086e094e40ee4dbada2c
-  data.tar.gz: 73d3fb910e501d6c85e67d32d459f2af338e1373ffaed6dabb3ed00e2245b4e8534753c369cb5882785d065fee6b5e204b5e57a8a7a295b538fd016bcb75e1c8
+  metadata.gz: 935e1f5108c992353d5118b3bde34e3099ae06ae7b767fd003c1f0b5c5696ae094cd76938f104233727bc1cdba21da94b56f98dfd74759f8f8272196fff0f5a8
+  data.tar.gz: a3a5f0308257604db0bd68ae76a13f4e1b7c982682e862e9a5406ceb961ad8026f4a6bcfcaa2b61afd4a5e262d860334acc54ab7f15d707c86bb4780e1888832

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -8,7 +8,7 @@ module Dor
       t.root(path: 'embargoMetadata')
       t.status
       t.embargo_status(path: 'status', index_as: [:symbol])
-      t.release_date(path: 'releaseDate', index_as: [:dateable])
+      t.release_date(path: 'releaseDate', type: :time)
       t.release_access(path: 'releaseAccess') do
         t.use do
           t.human(attributes: { type: 'useAndReproduction' })
@@ -35,10 +35,8 @@ module Dor
 
     def to_solr(solr_doc = {}, *args)
       solr_doc = super
-      #::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
-      rd1 = release_date
       rd20 = twenty_pct_release_date
-      ::Solrizer.insert_field(solr_doc, 'embargo_release', rd1.utc.strftime('%FT%TZ'), :dateable) unless rd1.blank?
+      ::Solrizer.insert_field(solr_doc, 'embargo_release', release_date.first.utc.strftime('%FT%TZ'), :dateable) unless release_date.blank?
       ::Solrizer.insert_field(solr_doc, 'twenty_pct_visibility_release', rd20.utc.strftime('%FT%TZ'), :dateable) unless rd20.blank?
       solr_doc
     end
@@ -60,19 +58,6 @@ module Dor
       term_values(:status).first
     end
 
-    # Sets the release date.  Does NOT convert to beginning-of-day.
-    # @param [Time] rd the release date object
-    def release_date=(rd = Time.now.utc)
-      update_values([:release_date] => rd.utc.xmlschema)
-    end
-
-    # Current releaseDate value
-    # @return [Time]
-    def release_date
-      rd = term_values(:release_date).first
-      rd.nil? || rd.empty? ? nil : Time.parse(rd)
-    end
-
     def twenty_pct_status=(new_status)
       update_values([:twenty_pct_status] => new_status)
     end

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -20,6 +20,14 @@ module Dor
         t.human
       end
 
+      t._read(path: 'access', attributes: { type: 'read' }) do
+        t.machine do
+          t.embargo_release_date(path: 'embargoReleaseDate', type: :time)
+        end
+      end
+
+      t.embargo_release_date(proxy: %i[_read machine embargo_release_date])
+
       t.creative_commons path: '/use/machine[@type=\'creativeCommons\']', type: 'creativeCommons' do
         t.uri path: '@uri'
       end

data/lib/dor/models/concerns/embargoable.rb

@@ -17,10 +17,12 @@ module Dor
     def release_embargo(release_agent = 'unknown')
       embargo_service.release(release_agent)
     end
+    deprecation_deprecate release_embargo: 'this moved to dor-service-app'
 
     def release_20_pct_vis_embargo(release_agent = 'unknown')
       embargo_service.release_20_pct_vis(release_agent)
     end
+    deprecation_deprecate release_20_pct_vis_embargo: 'this moved to dor-service-app'
 
     def embargoed?
       embargoMetadata.status == 'embargoed'
@@ -29,6 +31,7 @@ module Dor
     def update_embargo(new_date)
       embargo_service.update(new_date)
     end
+    deprecation_deprecate update_embargo: 'Use the method in EmbargoService instead'
 
     def embargo_service
       EmbargoService.new(self)

data/lib/dor/services/embargo_service.rb

@@ -35,6 +35,7 @@ module Dor
 
       events.add_event('embargo', release_agent, 'Embargo released')
     end
+    deprecation_deprecate release: 'this moved to dor-service-app'
 
     def release_20_pct_vis(release_agent)
       # Set status to released
@@ -55,25 +56,16 @@ module Dor
 
       events.add_event('embargo', release_agent, '20% Visibility Embargo released')
     end
+    deprecation_deprecate release_20_pct_vis: 'this moved to dor-service-app'
 
     def update(new_date)
       raise ArgumentError, 'You cannot change the embargo date of an item that is not embargoed.' if embargoMetadata.status != 'embargoed'
       raise ArgumentError, 'You cannot set the embargo date to a past date.' if new_date.past?
 
-      updated = false
-      rightsMetadata.ng_xml.search('//embargoReleaseDate').each do |node|
-        node.content = new_date.beginning_of_day.utc.xmlschema
-        updated = true
-      end
-      rightsMetadata.ng_xml_will_change!
-      rightsMetadata.save
-      raise 'No release date in rights metadata, cannot proceed!' unless updated
-
-      embargoMetadata.ng_xml.xpath('//releaseDate').each do |node|
-        node.content = new_date.beginning_of_day.utc.xmlschema
-      end
-      embargoMetadata.ng_xml_will_change!
-      embargoMetadata.save
+      time = new_date.beginning_of_day.utc
+      rightsMetadata.embargo_release_date = time
+      embargoMetadata.release_date = time
+      obj.save!
     end
 
     private

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '9.1.0'
+  VERSION = '9.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Michael Klein