dmp-dynamo_adapter 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be57979b11b7ac8a35b820835768a0d3118b54dc82134ba099c24d338858d603
-  data.tar.gz: 4a4e3804862bce06a1aec7cf91b0b7164c2ad3a256ce4e57fb2a7e869dcdaaee
+  metadata.gz: d66690b743822deb2db2a047370660b2cd7ec3206844534facbaf04f7f98474c
+  data.tar.gz: a2d9f06124324415cb5128d6f9f11b305c70d14656788fc38fe4f72bf9af1bc1
 SHA512:
-  metadata.gz: 69d866715074b1b34444b30cc64489af45b10ca90f5aa27d079dba2f4bfac17feaac7e74fc60a8837465fb4a67c801dbdf762665d40408fd8938c204a53d2628
-  data.tar.gz: 53e24074d088a3d5a5d1232257679b6018a221d7c140fe5a91e012ba409d78383035e588e344fdcf5111bd970fe639851e785c32b170e348af15d02e0547bfe8
+  metadata.gz: aaba013e38394e8f547a2002eb7c27b9fc9101f950fb53c0880b71c8cb57815dc2459fc65a262d09f1856af73a6ab7f5a3d1bbe15593985845f58c6f7a5bf85a
+  data.tar.gz: 650f1918d18c4408b25b732a18805b05ff11cb45e41a6aaeaf823d54954fbb4e7805edf60437ef2030348402d77770866787c8a574f9a155f97c77bd9b42a8f6

data/lib/dmp/dmp_id_handler.rb

@@ -10,25 +10,7 @@ module Dmp
 
     class << self
       def dmp_id_base_url
-        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}"
+        ENV['DMP_ID_BASE_URL']&.end_with?('/') ? ENV['DMP_ID_BASE_URL'] : "#{ENV['DMP_ID_BASE_URL']}/"
       end
 
       # Format the DMP ID in the way we want it

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::DmpIdHandler.dmp_id_base_url}#{dmp_id}"
+    end
+
     # Convert the latest version into a historical version
     # rubocop:disable Metrics/MethodLength
     def version_it(dmp:)

data/lib/dmp/metadata_handler.rb

@@ -74,7 +74,7 @@ p "ANNOTATING METADATA:"
         annotated['dmp_id'] = Dmp::DmpIdHandler.pk_to_dmp_id(p_key: annotated['PK'])
 
         # Update the modification timestamps
-        annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%M-%d')
+        annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
         annotated['dmphub_updated_at'] = Time.now.iso8601
         # Only add the Creation date if it is blank
         annotated['dmphub_created_at'] = Time.now.iso8601 if json['dmphub_created_at'].nil?
@@ -85,7 +85,7 @@ p "ANNOTATING METADATA:"
                             json.fetch('dmp_id', {})['identifier'].nil?
 
         # Record the original Provenance system's identifier
-        annotated['dmphub_provenance_identifier'] = json['dmp_id']
+        annotated['dmphub_provenance_identifier'] = json.fetch('dmp_id', {})['identifier']
         annotated
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

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.9
 platform: ruby
 authors:
 - briri