diff --git a/lib/dor/models/concerns/embargoable.rb b/lib/dor/models/concerns/embargoable.rb index c20c642e..e59f5403 100644 --- a/lib/dor/models/concerns/embargoable.rb +++ b/lib/dor/models/concerns/embargoable.rb @@ -38,7 +38,7 @@ def release_embargo(release_agent = 'unknown') end end - add_event('embargo', release_agent, 'Embargo released') + events.add_event('embargo', release_agent, 'Embargo released') end def release_20_pct_vis_embargo(release_agent = 'unknown') @@ -60,7 +60,7 @@ def release_20_pct_vis_embargo(release_agent = 'unknown') rights_xml.root.add_child(world_doc.root.clone) end - add_event('embargo', release_agent, '20% Visibility Embargo released') + events.add_event('embargo', release_agent, '20% Visibility Embargo released') end def update_embargo(new_date) diff --git a/lib/dor/models/concerns/eventable.rb b/lib/dor/models/concerns/eventable.rb index 2f9f7648..c22317ff 100644 --- a/lib/dor/models/concerns/eventable.rb +++ b/lib/dor/models/concerns/eventable.rb @@ -2,7 +2,10 @@ module Dor module Eventable + extend Deprecation extend ActiveSupport::Concern + self.deprecation_horizon = 'dor-services version 7.0.0' + included do has_metadata name: 'events', type: Dor::EventsDS, label: 'Events' end @@ -10,5 +13,6 @@ module Eventable def add_event(*args) datastreams['events'].add_event *args end + deprecation_deprecate add_event: 'call item.events.add_event instead.' end end diff --git a/lib/dor/models/concerns/versionable.rb b/lib/dor/models/concerns/versionable.rb index 07281e5f..57253a22 100644 --- a/lib/dor/models/concerns/versionable.rb +++ b/lib/dor/models/concerns/versionable.rb @@ -38,7 +38,7 @@ def open_new_version(opts = {}) vmd_upd_info = opts[:vers_md_upd_info] return unless vmd_upd_info - add_event('open', vmd_upd_info[:opening_user_name], "Version #{vmd_ds.current_version_id} opened") + events.add_event('open', vmd_upd_info[:opening_user_name], "Version #{vmd_ds.current_version_id} opened") vmd_ds.update_current_version(description: vmd_upd_info[:description], significance: vmd_upd_info[:significance].to_sym) save end