uc3-dmp-id 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2cccff208ffef601a91dc92d6cd2e3ed5b517fd47e09254ff7fea2572ea928
-  data.tar.gz: 32ed9cdab64dcc03154eacb748ad3fe9bde7ee61d4080874092381c3ffc59c09
+  metadata.gz: f57c20b88aa66fde624307bb92a176682f83058929d36c54f5bc8f3930a98b2d
+  data.tar.gz: 2dc28c07fc2fc766904b3360b043cd6c3b3af7a772765f5681e9dd29040d0a39
 SHA512:
-  metadata.gz: c65520e657194a50a53c6fa88d5e5e43ae471c8d7ac5a56b5da1d3b16bbf0932b90eb42f01674141afbd3577ac071e02c77e8accb7d0e3c3eb150e8344a8bca7
-  data.tar.gz: 5ab9a028be14f33f10031ef3530d78e2f9d09fb496c9a8225f664fa307de50b8a3fb2fbb1615bc4e0226a3197273a440b3aa00bdf955e25b92dc117716cc905f
+  metadata.gz: 9896f63e4d891d16bd97d5293516bf3dc4694ae9dcb8490431433d1061e03dca23c5f99a5d0b6959e7316e6eec19cd5c16aaa7ec93d3fd156b6d877097aec8c9
+  data.tar.gz: fe9a16d6cf9cfad66eb1547137fa5a43583b59c3198476809249a311a01ee91a3086802108a9196dfeb0a95f48620e992505f03d4fe178b434059cf7722b2809

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

@@ -136,10 +136,16 @@ module Uc3DmpId
       # Add DMPHub specific fields to the DMP ID JSON
       def annotate_dmp_json(provenance:, owner_org:, p_key:, json:)
         json = parse_json(json: json)
+
+puts "annotate - prov: #{provenance['PK']}, owner_org: #{owner_org}, p_key: #{p_key}, Hash? #{json.is_a?(Hash)} ::: #{provenance.nil? || owner_org.nil? || p_key.nil? || !json.is_a?(Hash)}"
+
         return json if provenance.nil? || owner_org.nil? || p_key.nil? || !json.is_a?(Hash)
 
         # Fail the json as is if the :PK does not match the :dmp_id if the json has a :PK
         id = dmp_id_to_pk(json: json.fetch('dmp_id', {}))
+
+puts "annotate - id: #{id}, PK exist? #{json['PK']} ::: #{id != p_key && !json['PK'].nil?}"
+
         return json if id != p_key && !json['PK'].nil?
 
         annotated = deep_copy_dmp(obj: json)

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

@@ -46,23 +46,29 @@ 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 = dmp['dmp'].fetch('contact', {}).fetch('dmproadmap_affiliation', {}) unless dmp.nil?
+      owner_org = owner_org.fetch('affiliation_id', {})['identifier'] unless owner_org.nil?
+
+puts "OWNER ORG: #{owner_org}"
+
+      # 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.61'
 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.61
 platform: ruby
 authors:
 - Brian Riley