uc3-dmp-id 0.0.64 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0c6efaee7727ad373bdccdc9184e12d1abefafe3834768c210d949d854c669
-  data.tar.gz: 0c771250b7459256822a87dc99bdbc720ebca8cc2f4d5a5c53ccfcf5a8a0d0aa
+  metadata.gz: b2d9a4bba715adc0eb2b0101d9484d8a57ea7f3643a3cd63088191fa82da5157
+  data.tar.gz: b42b00fa9a0bfae9c4f69539ebb612f9c2ab063fe20b1d96987a62cbe35cae60
 SHA512:
-  metadata.gz: 98025dcd7ccdd69b284b910d8391a715c2b2b72799398cf432bf1688efc25b22caf7f25e5b5ca0eb2d528b7256703304f287fa15b92cc9df6ce96d4aa4e7c738
-  data.tar.gz: bdc3d64ec36a853aca5ec44d32a415b65dc868b83c3bd48ce4054aae2a546a8005b3f25400d6bd759ef8fb6085e1f0bdfea16c1b4b6e178e1861e443a9a1cb3e
+  metadata.gz: aba3791e3f85c77c3b1fce370e8d4c62e441148c2ea399074ad794505165fb9475488b552001f29613eaf5540e300a3271fe66b83af55bb6410679526828906b
+  data.tar.gz: e5d2470504ff9dbc2d9c61552c69a20229de6ae29d32361df1cf197b4ca97252bfb2d353c3126f42ab2a9b5f601e18a39ef1d6b4ccb6949caa1b2cfdeb7dcdb5

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

@@ -38,7 +38,7 @@ module Uc3DmpId
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
 
         # Add the DMPHub specific attributes and then save
-        annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: json['dmp'])
+        annotated = Helper.annotate_dmp_json(provenance: provenance, p_key: p_key, json: json['dmp'])
         puts "CREATING DMP ID:" if debug
         puts annotated if debug
 

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

@@ -133,16 +133,32 @@ module Uc3DmpId
         a == b
       end
 
+      # Extract the Contact's ORCID id
+      def extract_owner_id(json: {})
+        return nil unless json.is_a?(Hash)
+
+        dmp = json['dmp'].nil? ? json : json['dmp']
+        owner_org = dmp.fetch('contact', {}).fetch('contact_id', {})['identifier']
+
+        dmp.fetch('contributor', []).map do { |contributor| contributor.fetch('contact_id', {})['identifier'] }.first
+      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']
+        return owner_org unless owner_org.nil?
+
+        orgs = dmp.fetch('contributor', []).map do |contributor|
+          contributor.fetch('dmproadmap_affiliation', {}).fetch('affiliation_id', {})['identifier']
+        end
+        orgs.compact.max_by { |i| orgs.count(i) }
       end
 
       # Add DMPHub specific fields to the DMP ID JSON
-      def annotate_dmp_json(provenance:, owner_org:, p_key:, json:)
+      def annotate_dmp_json(provenance:, p_key:, json:)
         json = parse_json(json: json)
         return json if provenance.nil? || owner_org.nil? || p_key.nil? || !json.is_a?(Hash)
 
@@ -157,9 +173,13 @@ module Uc3DmpId
         # Ensure that the :dmp_id matches the :PK
         annotated['dmp_id'] = pk_to_dmp_id(p_key: remove_pk_prefix(p_key: annotated['PK']))
 
+        owner_id = extract_owner_id(json: json)
+        owner_org = extract_owner_org(json: json)
+
         # Update the modification timestamps
         annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
-        annotated['dmphub_owner_org'] = owner_org.to_s
+        annotated['dmphub_owner_id'] = owner_id unless owner_id.nil?
+        annotated['dmphub_owner_org'] = owner_org unless owner_org.nil?
         annotated['dmphub_updated_at'] = Time.now.iso8601
         # Only add the Creation date if it is blank
         annotated['dmphub_created_at'] = Time.now.iso8601 if json['dmphub_created_at'].nil?
@@ -181,10 +201,6 @@ module Uc3DmpId
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       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,7 +46,6 @@ 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 = 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?
 
@@ -54,7 +53,7 @@ module Uc3DmpId
         raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
 
         # 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 = Helper.annotate_dmp_json(provenance: provenance, 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

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

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

metadata

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