uc3-dmp-id 0.0.60 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2cccff208ffef601a91dc92d6cd2e3ed5b517fd47e09254ff7fea2572ea928
-  data.tar.gz: 32ed9cdab64dcc03154eacb748ad3fe9bde7ee61d4080874092381c3ffc59c09
+  metadata.gz: 8d86231b0d9bbba113c84fca3f8496f7a1d09eb07386b13f3a8082d1b79d9cd5
+  data.tar.gz: 4c5bdfeda6ad713e7a77e6bb6cc27f5942dc170fe477920a40f42da43ff00f40
 SHA512:
-  metadata.gz: c65520e657194a50a53c6fa88d5e5e43ae471c8d7ac5a56b5da1d3b16bbf0932b90eb42f01674141afbd3577ac071e02c77e8accb7d0e3c3eb150e8344a8bca7
-  data.tar.gz: 5ab9a028be14f33f10031ef3530d78e2f9d09fb496c9a8225f664fa307de50b8a3fb2fbb1615bc4e0226a3197273a440b3aa00bdf955e25b92dc117716cc905f
+  metadata.gz: 55a11fcf0cae95da912fde23d91b10a4cb0b0aed0fe607bab4a6db267e59030faa1c7d53b40bb9780888646bf530c296c9d9532a5b2ed77ab892af4606579ba2
+  data.tar.gz: b305efdd75d24efc03ed9a792b7c8b04c3c530618071440c651a65f46f1a60b68d73e01185acbb65f928f4d34dfe35d733ee8ee39ef5af3afc41a23c7ca55b65

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

@@ -133,6 +133,14 @@ module Uc3DmpId
         a == b
       end
 
+      # Extract the Contact's affiliaiton ROR ID
+      def extract_owner_org(json: {})
+        return nil unless json.is_a?(Hash)
+
+        dmp = json['dmp'].nil? ? json : json['dmp']
+        owner_org = dmp.fetch('contact', {}).fetch('dmproadmap_affiliation', {}).fetch('affiliation_id', {})['identifier']
+      end
+
       # Add DMPHub specific fields to the DMP ID JSON
       def annotate_dmp_json(provenance:, owner_org:, p_key:, json:)
         json = parse_json(json: json)
@@ -143,7 +151,7 @@ module Uc3DmpId
         return json if id != p_key && !json['PK'].nil?
 
         annotated = deep_copy_dmp(obj: json)
-        annotated['PK'] = json['PK'] || p_key
+        annotated['PK'] = json['PK'] || append_pk_prefix(p_key: p_key)
         annotated['SK'] = DMP_LATEST_VERSION
 
         # Ensure that the :dmp_id matches the :PK

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

@@ -46,23 +46,25 @@ module Uc3DmpId
       # 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?
+      owner_org = Helper.extract_owner_org(json: dmp)
+      # Don't continue if DMP ID could not be found or the contact has no identifier (should be impossible)
+      raise UpdaterError, MSG_DMP_NOT_FOUND if dmp.nil? || owner_org.nil?
 
       errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp['dmp'])
       raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
 
-      # Add the DMPHub specific attributes
-      dmp['dmp']['dmproadmap_related_identifiers'] = [] if dmp['dmp']['dmproadmap_related_identifiers'].nil?
-      dmp['dmp']['dmproadmap_related_identifiers'] << {
+      # Add the DMPHub specific attributes and then add the download URl for the PDF
+      annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: dmp['dmp'])
+      annotated['dmproadmap_related_identifiers'] = [] if annotated['dmproadmap_related_identifiers'].nil?
+      annotated['dmproadmap_related_identifiers'] << {
         descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url
       }
 
 puts "Attached:"
-puts dmp
+puts annotated
 
-      # Save the changes as the new latest version
-      resp = client.put_item(json: dmp['dmp'], debug: debug)
+      # Save the changes without creating a new version!
+      resp = client.put_item(json: annotated, debug: debug)
       raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
 
       true

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

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

metadata

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