uc3-dmp-id 0.0.48 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f184f47843a41741118c64764999e2e63e66bf8092c8052d00f75bf7b5a04063
-  data.tar.gz: 44b5cafd4ef3f6043a4b1873d66fa3f9b9dde2f328203b8dd0c5537a042a245c
+  metadata.gz: be8e880666031df3010f048c10afe83dbd614d7a5e51015f53fc67964a1519f5
+  data.tar.gz: d765faf0c263d97c09ee30a0b64aa176e9968fbe1b4eb065b273d3a1aacfc6f5
 SHA512:
-  metadata.gz: b6923c6148a6b347efbf00955d7aaafb810edbc42c38818191a9e440faaf648555753fc271a47f520d6ef489a135b5b9d65b468311c24da9feb22e7aa256660b
-  data.tar.gz: 0d54dc2c84c8a74dc0edf02a88971939fd307940837a0edd9ec1fae4144c3dcf5675e89dcb9b9cf08a2a6072eb44cae9bb14ad82e6343ea0b4676e0904f3970c
+  metadata.gz: 422f3912f9fa3eda4fa33a989e898378f3afb6080c8191c7ae43de6edea116b6f3aed0859b1825eddf09582416b5c5f69b51175a330846d3fed8fddcb197a380
+  data.tar.gz: a819663b7e7bbe5be506a71b83d94a337dd3699c5f3cde9378f6b5bf2323dda56cca4e9b170c0d81d36e840d4939d556fd064a8329d1e820f62a743e47397176

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

@@ -29,12 +29,12 @@ module Uc3DmpId
 
         # TODO: Swap this out with the Finder search once the Dynamo indexes are working
         # Try to find it first and Fail if found
-        # result = Finder.by_json(json: json, debug: debug)
-        # raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS if result.is_a?(Hash)
-        raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS unless json['PK'].nil?
+        result = Finder.by_json(json: json, debug: debug)
+        raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS if result.is_a?(Hash)
+        # raise CreatorError, Uc3DmpId::MSG_DMP_EXISTS unless json['PK'].nil?
 
         client = Uc3DmpDynamo::Client.new(debug: debug)
-        p_key = _preregister_dmp_id(client: client, json: json, debug: debug)
+        p_key = _preregister_dmp_id(client: client, provenance: provenance, json: json, debug: debug)
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
 
         # Add the DMPHub specific attributes and then save
@@ -52,12 +52,21 @@ module Uc3DmpId
 
       private
 
-      def _preregister_dmp_id(client:, json:, debug: false)
+      def _preregister_dmp_id(client:, provenance:, json:, debug: false)
         # Use the specified DMP ID if the provenance has permission
         existing = json.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['type'].downcase == 'doi' && !Finder.exists?(client: client, p_key: id)
+
+puts "_preregister_dmp_id:"
+puts provenance
+puts json
+puts id
+
+        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)
 
         dmp_id = ''
         counter = 0

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

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

metadata

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