dmp-dynamo_adapter 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33302af56b5e3b2046ced1ca5b826a0b52abd2c7c57ff1ac738e7f21f58642b6
-  data.tar.gz: a484cdc69656ce174c7d2319d615b44b7ac1115026f164e027b1cf1e67f04a78
+  metadata.gz: 41ac93e31c250106a76873be5e069337fe772387bef81350afdffe231a09ad80
+  data.tar.gz: 9998934e79fbdb99639088e64bea3b6a3b516df5b20db4ce8733e7c5bcc7c10c
 SHA512:
-  metadata.gz: 7ad5921565684cef3a980ca8b678c2d6a5d753a98dca73f120396d81dfb55c388c55e06f91ad23741f3344537426e4a84ccae4d5aa0af5728fd9c4c2d0e2ff98
-  data.tar.gz: c1d5f67f064806bb4a002ce11e584d40879868df6ff1037c52706640843297a58f922e140ece87df046d743a857a21da24b10c4bb20f1e34a37432cf9ad3821a
+  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)
@@ -105,16 +104,12 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
 
       # Try to find it first
       result = find_by_json(json: json)
-
-p "RESULT:"
-pp result
-
       return { status: 500, error: result.fetch(:error, MSG_DEFAULT) } if result[:status] == 500
       # Abort if found
-      return { status: 400, error: MSG_EXISTS } if result[:items].any?
+      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}"
 
@@ -283,16 +278,35 @@ p "FINDING BY PROVENANCE ID: #{json['dmp_id']['identifier']}"
 p "RESPONSE:"
 pp response.data
 
-      return { status: 404, error: MSG_NOT_FOUND } if response.nil? || response[:Count] <= 0
+      return { status: 404, error: MSG_NOT_FOUND } if response.nil? || response[:count] <= 0
 
       # If we got a hit, fetch the DMP and return it.
-      find_by_pk(p_key: response.fetch(:LastEvaluatedKey, {})[:HashKeyElement],
-                 s_key: response.fetch(:LastEvaluatedKey, {})[:RangeKeyElement])
+      find_by_pk(p_key: response.fetch(:last_evaluated_key, {})[:hash_key_element],
+                 s_key: response.fetch(:last_evaluated_key, {})[:range_key_element])
     rescue Aws::Errors::ServiceError => e
       { status: 500, error: "#{MSG_DEFAULT} - #{e.message}" }
     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.4
+  version: 0.2.7
 platform: ruby
 authors:
 - briri