uc3-dmp-id 0.0.71 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99921e6917f8a405ae38995e797bb69bf05499813ff9b07271ded5657285f94d
-  data.tar.gz: 17637fbbebb9632878be57ef1b1d53ca6e77cad7dc1505c68bf7626eb47734dd
+  metadata.gz: 887398e3e0a37412b53474a625428c286279daec1c7a7c2ef6bd809d7fc7c7e7
+  data.tar.gz: ae415d68ee2443712e08c92328dc2770bfeae68135143afb8bea946d7204939d
 SHA512:
-  metadata.gz: 9c0b78403c2fcd65a18fce747a91fe3222d1adb895a94f0f2dde1c7957eed7c024a0b3b0ca9170c57a594aded1a1fa56fab1ea43b9f470da7407768bfac0b0e6
-  data.tar.gz: a7f28875760efb596897e48a17bfe16abef184282fa279bf03e885dfee2bd159fd4bd3c92f95b282d964897189c4ee1b00af5d18ae1e328a2cdcc49cd713ec19
+  metadata.gz: ba0cb83cf68f8d4d30200e628790a9c55c78ed094612e025c70de6f547453ef269612d8ef6ac78c29363e5e9052723b46cded49ca6f20ec235f81e99074fe830
+  data.tar.gz: 2106286ee96a94ed380c9dea0dcdde7aa629d39bf986efa1cd40c3a8ec6ea150c924ce41c633f8de19b4e6edccc50ffe981112d4495ae35451c6f2dd2932773f

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

@@ -54,13 +54,14 @@ module Uc3DmpId
       def _preregister_dmp_id(client:, provenance:, json:, debug: false)
         # Use the specified DMP ID if the provenance has permission
         existing = json.fetch('dmp', {}).fetch('dmp_id', {})
-        id = existing['identifier'].gsub(%r{https?://}, Helper::PK_DMP_PREFIX) if existing.is_a?(Hash) &&
-                                                                                  !existing['identifier'].nil?
-        return id if !id.nil? &&
-                     existing.fetch('type', 'other').to_s.downcase == 'doi' &&
-                     provenance.fetch('seedingWithLiveDmpIds', false).to_s.downcase == 'true' &&
-                     !Finder.exists?(client: client, p_key: id)
+        seed_id = json.fetch('dmp', {})['dmproadmap_external_system_identifier']
 
+        # If we are seeding already registered DMP IDs from the Provenance system, then return the original DMP ID
+        return seed_id if existing.fetch('type', 'other') == 'url' &&
+                          !seed_id.nil? &&
+                          provenance.fetch('seedingWithLiveDmpIds', false).to_s.downcase == 'true'
+
+        #Generate a new DMP ID
         dmp_id = ''
         counter = 0
         while dmp_id == '' && counter <= 10

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

@@ -46,8 +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)
-        # 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?

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.73
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json