dmp-dynamo_adapter 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be57979b11b7ac8a35b820835768a0d3118b54dc82134ba099c24d338858d603
-  data.tar.gz: 4a4e3804862bce06a1aec7cf91b0b7164c2ad3a256ce4e57fb2a7e869dcdaaee
+  metadata.gz: 41ac93e31c250106a76873be5e069337fe772387bef81350afdffe231a09ad80
+  data.tar.gz: 9998934e79fbdb99639088e64bea3b6a3b516df5b20db4ce8733e7c5bcc7c10c
 SHA512:
-  metadata.gz: 69d866715074b1b34444b30cc64489af45b10ca90f5aa27d079dba2f4bfac17feaac7e74fc60a8837465fb4a67c801dbdf762665d40408fd8938c204a53d2628
-  data.tar.gz: 53e24074d088a3d5a5d1232257679b6018a221d7c140fe5a91e012ba409d78383035e588e344fdcf5111bd970fe639851e785c32b170e348af15d02e0547bfe8
+  metadata.gz: 9bdd9d6d4ab79239ca07993ebcb991f3d9298ce01f21058a841921970646b8f08b33ee5239338b95626ca37e19f1272b37da3706425fd985b7a17f2db67fa205
+  data.tar.gz: 7d374a240cac71d3cd65d1422fbb983e1b4e10f6d8e1096ad9a4ed973d521229a9bf078db1c7a86e8862c3ad596f95e7f4899e9c0e11751339691e1006cd3dbd

data/lib/dmp/dmp_id_handler.rb

@@ -22,7 +22,10 @@ p 'PREREGISTER DMP ID:'
 
         while dmp_id == '' && counter <= 10
           prefix = "#{ENV['DMP_ID_SHOULDER']}.#{SecureRandom.hex(4).upcase}"
-          dmp_id = prefix if find_by_pk(p_key: Dmp::MetadataHandler.append_pk_prefix(dmp: dmp_id)).empty?
+          result = Dmp::DynamoAdapter.find_by_pk(
+            p_key: Dmp::MetadataHandler.append_pk_prefix(dmp: dmp_id)
+          )
+          dmp_id = prefix unless result[:status] != 404
           counter += 1
         end
         # Something went wrong and it was unable to identify a unique id

data/lib/dmp/dynamo_adapter.rb

@@ -89,8 +89,7 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
 
       # find_by_PK
       response = find_by_pk(p_key: pk, s_key: json['SK']) unless pk.nil?
-      return response if response[:status] == 500
-      return response unless response[:items].nil? || response[:items].empty?
+      return response unless response[:status] != 404
 
       # find_by_dmphub_provenance_id -> if no PK and no dmp_id result
       find_by_dmphub_provenance_identifier(json: json)
@@ -110,7 +109,7 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
       return { status: 400, error: MSG_EXISTS } if result.fetch(:items, []).any?
 
       # allocate a DMP ID
-      p_key = Dmp::DmpIdHandler.preregister_dmp_id
+      p_key = preregister_dmp_id
 
 p "PRE REGISTERED DMP ID: #{p_key.inspect}"
 
@@ -289,6 +288,25 @@ pp response.data
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
+    # Preassign a DMP ID that will leater be sent to the DOI minting authority (EZID)
+    def preregister_dmp_id
+      dmp_id = ''
+      counter = 0
+
+p 'PREREGISTER DMP ID:'
+
+      while dmp_id == '' && counter <= 10
+        prefix = "#{ENV['DMP_ID_SHOULDER']}.#{SecureRandom.hex(4).upcase}"
+        result = find_by_pk(p_key: Dmp::MetadataHandler.append_pk_prefix(dmp: dmp_id))
+        dmp_id = prefix unless result[:status] != 404
+        counter += 1
+      end
+      # Something went wrong and it was unable to identify a unique id
+      return nil if counter >= 10
+
+      "#{Dmp::MetadataHandler::PK_DMP_PREFIX}#{dmp_id_base_url}#{dmp_id}"
+    end
+
     # Convert the latest version into a historical version
     # rubocop:disable Metrics/MethodLength
     def version_it(dmp:)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmp-dynamo_adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - briri