dmp-dynamo_adapter 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b673c5ab8af1a4ada8c4f14be3c2543c7af6e16ad3fbe34a31552451fea8a3
-  data.tar.gz: 77484e5b3f58fd9088b635ab2e9fcd47b493aeb4fefc46618daec56a6dd993aa
+  metadata.gz: 1fde969438aa9681c5213d60e441b3187de1ed2141c7b244419ba47a007d39fc
+  data.tar.gz: a4a9722f607edf91644043c4adbcb3af7bfe81f33d254da104a0223a27fd6c40
 SHA512:
-  metadata.gz: b81abb15e34a2e6ca1d5dc0405b98bdae243b6099cca1f2c83735ea3b540c293059cb5d652d77095b899e2ac04b374f319dcdd6842f32a4b5dd76681b8bff083
-  data.tar.gz: 29a757ae20c3888e0f9c5dd8fdd17b2b77b20c2af5c1b9c0a14e003bf55054d371c57a484730088d4d50decc5e95e9f090135070bc3a6d6d8f6df495bc4c5bf2
+  metadata.gz: 0ba67f79d6cdf0b4d29f416301e88b8b4453f85b7381a82280f5389dde4c12bb5446e59bdd21290d04203dbcdaefc73f08c1bd8ffd5221b945a19e514e4f1c2b
+  data.tar.gz: 8c2a12ccd6b1049a12f254a6ae5f634c63aa2c3b82870778fd541482d6888cd720426ac6cb213d72b6fb3605ad38a3b948abf7393f63b90cc3898fa72f60966e

data/lib/dmp/dmp_id_handler.rb

@@ -13,24 +13,6 @@ module Dmp
         ENV['DMP_ID_BASE_URL'].end_with?('/') ? ENV['DMP_ID_BASE_URL'] : "#{ENV['DMP_ID_BASE_URL']}/"
       end
 
-      # 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}"
-          dmp_id = prefix if find_by_pk(p_key: Dmp::MetadataHandler.append_pk_prefix(dmp: dmp_id)).empty?
-          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
-
       # Format the DMP ID in the way we want it
       def format_dmp_id(value:)
         dmp_id = value.match(DOI_REGEX).to_s

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}"
 
@@ -293,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::DmpIdHandler.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.5
+  version: 0.2.8
 platform: ruby
 authors:
 - briri