uc3-dmp-id 0.0.61 → 0.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57c20b88aa66fde624307bb92a176682f83058929d36c54f5bc8f3930a98b2d
-  data.tar.gz: 2dc28c07fc2fc766904b3360b043cd6c3b3af7a772765f5681e9dd29040d0a39
+  metadata.gz: f83d0a009fdbffc97f8725896fb33492c6444ac2f12d798a5b221f879f4d0d32
+  data.tar.gz: 49287ecaa021b356bf48eafbe79135b4dbcc5172b7ddb918d837fdfb8aea0856
 SHA512:
-  metadata.gz: 9896f63e4d891d16bd97d5293516bf3dc4694ae9dcb8490431433d1061e03dca23c5f99a5d0b6959e7316e6eec19cd5c16aaa7ec93d3fd156b6d877097aec8c9
-  data.tar.gz: fe9a16d6cf9cfad66eb1547137fa5a43583b59c3198476809249a311a01ee91a3086802108a9196dfeb0a95f48620e992505f03d4fe178b434059cf7722b2809
+  metadata.gz: 318c39772d51a114597438aef45e84d9a627f3132b6ac2d091254fa5e674bc0bc133701829cec11b667e92e367cc07f83e925c5f07cf2332defe7c6e7163eb27
+  data.tar.gz: b987744fdbb5aa0dce30538be6d58e68b9b0e00b03de5b58fb817906fdcbed9a5c47f62a49092ec21e736e67dc1d1f5451a13b13136c50f3a08328e24c8b34e6

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

@@ -47,7 +47,7 @@ module Uc3DmpId
         raise CreatorError, Uc3DmpId::MSG_DMP_NO_DMP_ID if resp.nil?
 
         _post_process(json: annotated, debug: debug)
-        annotated
+        Helper.cleanse_dmp_json(json: annotated)
       end
 
       private

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

@@ -133,27 +133,29 @@ 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)
-
-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)
-        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
-        annotated['dmp_id'] = pk_to_dmp_id(p_key: annotated['PK'])
+        annotated['dmp_id'] = pk_to_dmp_id(p_key: remove_pk_prefix(p_key: annotated['PK']))
 
         # Update the modification timestamps
         annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
@@ -180,6 +182,9 @@ puts "annotate - id: #{id}, PK exist? #{json['PK']} ::: #{id != p_key && !json['
       def cleanse_dmp_json(json:)
         return json unless json.is_a?(Hash) || json.is_a?(Array)
 
+puts "Cleansing DMP JSON:"
+puts json
+
         # If it's an array clean each of the objects individually
         return json.map { |obj| cleanse_dmp_json(json: obj) }.compact if json.is_a?(Array)
 

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

@@ -46,11 +46,7 @@ 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)
-      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}"
-
+      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?
 

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

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

metadata

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