uc3-dmp-id 0.0.68 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94c8ef3d724aa5d75d88a1f58f8180c8aa9021b11b56c7f431ce0c68a250aaa
-  data.tar.gz: 160e795437ca56d665d5c1a67b515c191a976954c4132198fd8ae5c402e771cd
+  metadata.gz: f0ca5545af2c686ec3c72c6d87ee6035f2c32d15e4e02e88a2242405d989c723
+  data.tar.gz: dc8abcfa7e6f83b0f4c65701595d57f6dfa8a3ba59049b3a90814eaa08036c35
 SHA512:
-  metadata.gz: 6f7052975061b7d34e12ef319c9581b0738f8525f7fe8fead743ebc0546d21e01078435f31d9907363aa5539b7a33fd03c8f85a34c1d02246feebaa977e41ae1
-  data.tar.gz: e1b9537db7d56889619d9bb2feca761aac0441822203a3507effa36f35510a2c2a2b819a277895fd2703baa1308ee4adb2788a902782fb3909489d4e5e058ebe
+  metadata.gz: f1396221ec09ad597c60b0227263589ef4ab5dbec2a0522ccfd264d87d4c7125bb69d0953be1faa3a3bb1cf0e9ad0a10472d1933501edb7d54a8fdd137017d7c
+  data.tar.gz: 00b202a1a166b2ad2a334503991e20d470e0ed445e5635a199c244c5622e2d3f8bbbf13da07989b2958625904f13c3fd067a96ff5eaec6d304630b723f5886f6

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

@@ -138,7 +138,8 @@ module Uc3DmpId
         return nil unless json.is_a?(Hash)
 
         dmp = json['dmp'].nil? ? json : json['dmp']
-        owner_org = dmp.fetch('contact', {}).fetch('contact_id', {})['identifier']
+        id = dmp.fetch('contact', {}).fetch('contact_id', {})['identifier']
+        return id unless id.nil?
 
         dmp.fetch('contributor', []).map { |contributor| contributor.fetch('contact_id', {})['identifier'] }.first
       end
@@ -160,7 +161,7 @@ module Uc3DmpId
       # Add DMPHub specific fields to the DMP ID 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)
+        return json if provenance.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', {}))
@@ -190,9 +191,15 @@ module Uc3DmpId
                             json.fetch('dmp_id', {})['identifier'].nil?
 
         # Record the original Provenance system's identifier
-        annotated['dmphub_provenance_identifier'] = format_provenance_id(
-          provenance: provenance, value: json.fetch('dmp_id', {})['identifier']
-        )
+        # If we are currently seeding records for existing DMP IDs, then use the :dmproadmap_links
+        if provenance.fetch('seedingWithLiveDmpIds', false).to_s.downcase == 'true' &&
+           !annotated.fetch('dmproadmap_links', {})['get'].nil?
+          annotated['dmphub_provenance_identifier'] = annotated.fetch('dmproadmap_links', {})['get']
+        else
+          annotated['dmphub_provenance_identifier'] = format_provenance_id(
+            provenance: provenance, value: json.fetch('dmp_id', {})['identifier']
+          )
+        end
         annotated
       end
 

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

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

metadata

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