uc3-dmp-id 0.0.50 → 0.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8e880666031df3010f048c10afe83dbd614d7a5e51015f53fc67964a1519f5
-  data.tar.gz: d765faf0c263d97c09ee30a0b64aa176e9968fbe1b4eb065b273d3a1aacfc6f5
+  metadata.gz: 3259fcdd4e0878c48793799628f8b99386301581352b694469b311cf72d1e553
+  data.tar.gz: d43a114272138af758e54fbb113398fef23d4fe6b2fff8a28b89fc7cd973a367
 SHA512:
-  metadata.gz: 422f3912f9fa3eda4fa33a989e898378f3afb6080c8191c7ae43de6edea116b6f3aed0859b1825eddf09582416b5c5f69b51175a330846d3fed8fddcb197a380
-  data.tar.gz: a819663b7e7bbe5be506a71b83d94a337dd3699c5f3cde9378f6b5bf2323dda56cca4e9b170c0d81d36e840d4939d556fd064a8329d1e820f62a743e47397176
+  metadata.gz: f539afeb4ddc714a737649b68bfa55e7b2c5b7c49afcb64c7d42a7c1281d59b68523ba7f1188da94026c4cd4b69a75df63f1ef86dc4e7c11523cf48e5e77e9ae
+  data.tar.gz: ec959594a81a6b63ccb2f08676c5cd7bfda4de7baefad0acc80020a2f13d4a5198d3f72b8244d608aaa65d88eed52246c369c1337f21fe3e6a4a0bc4a587f065

data/lib/uc3-dmp-id/creator.rb

@@ -54,15 +54,9 @@ module Uc3DmpId
 
       def _preregister_dmp_id(client:, provenance:, json:, debug: false)
         # Use the specified DMP ID if the provenance has permission
-        existing = json.fetch('dmp_id', {})
+        existing = json.fetch('dmp', {}).fetch('dmp_id', {})
         id = existing['identifier'].gsub(%r{https?://}, Helper::PK_DMP_PREFIX) if existing.is_a?(Hash) &&
                                                                                   !existing['identifier'].nil?
-
-puts "_preregister_dmp_id:"
-puts provenance
-puts json
-puts id
-
         return id if !id.nil? &&
                      existing.fetch('type', 'other').to_s.downcase == 'doi' &&
                      provenance.fetch('seedingWithLiveDmpIds', false).to_s.downcase == 'true' &&

data/lib/uc3-dmp-id/updater.rb

@@ -10,11 +10,11 @@ module Uc3DmpId
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       # -------------------------------------------------------------------------
       def update(provenance:, p_key:, json: {})
-      raise DeleterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
+      raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
 
       dmp = Helper.parse_json(json: json)
       errs = _updateable?(provenance: provenance, p_key: p_key, dmp: dmp)
-      raise DeleterError, errs if errs.is_a?(Array) && errs.any?
+      raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
 
       # Add the DMPHub specific attributes
       annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
@@ -23,15 +23,15 @@ module Uc3DmpId
       client = Uc3DmpDynamo::Client.new(debug: debug)
       existing = Finder.by_pk(p_key: p_key, client: client, debug: debug)
       # Don't continue if nothing has changed!
-      raise DeleterError, MSG_NO_CHANGE if Helper.eql?(dmp_a: existing, dmp_b: annotated)
+      raise UpdaterError, MSG_NO_CHANGE if Helper.eql?(dmp_a: existing, dmp_b: annotated)
 
       # Generate a new version of the DMP. This involves versioning the current latest version
       new_version = versioner.new_version(p_key: p_key, dmp: json)
-      raise DeleterError, MSG_DMP_UNABLE_TO_VERSION if new_version.nil?
+      raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if new_version.nil?
 
       # Save the changes as the new latest version
       resp = client.put_item(json: new_version, debug: debug)
-      raise DeleterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
+      raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
 
       # Send the updates to EZID, notify the provenance and download the PDF if applicable
       _post_process(json: dmp, debug: debug)
@@ -40,6 +40,30 @@ module Uc3DmpId
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+    def attach_narrative(provenance:, p_key:, url:, debug: false)
+      raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
+
+      # fetch the existing latest version of the DMP ID
+      client = Uc3DmpDynamo::Client.new(debug: debug)
+      dmp = Finder.by_pk(p_key: p_key, client: client, debug: debug)
+      # Don't continue if nothing has changed!
+      raise UpdaterError, MSG_DMP_NOT_FOUND if dmp.nil?
+
+      errs = _updateable?(provenance: provenance, p_key: p_key, dmp: dmp)
+      raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
+
+      # Add the DMPHub specific attributes
+      annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
+      annotated['dmproadmap_related_identifiers'] = [] if annotated['dmproadmap_related_identifiers'].nil?
+      annotated << { descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url }
+
+      # Save the changes as the new latest version
+      resp = client.put_item(json: annotated, debug: debug)
+      raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
+
+      true
+    end
+
     private
 
     # Check if the DMP ID is updateable by the provenance

data/lib/uc3-dmp-id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.0.50'
+  VERSION = '0.0.52'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.52
 platform: ruby
 authors:
 - Brian Riley