dmp-dynamo_adapter 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41ac93e31c250106a76873be5e069337fe772387bef81350afdffe231a09ad80
-  data.tar.gz: 9998934e79fbdb99639088e64bea3b6a3b516df5b20db4ce8733e7c5bcc7c10c
+  metadata.gz: 1df64725fca2ba042c200d8615e9d304503836f48bd04451cb08a034773b4ad9
+  data.tar.gz: ce3dc12d41f2b48f7106d390cb0ef7d7b61f5ea3d77337adba094e8604f59575
 SHA512:
-  metadata.gz: 9bdd9d6d4ab79239ca07993ebcb991f3d9298ce01f21058a841921970646b8f08b33ee5239338b95626ca37e19f1272b37da3706425fd985b7a17f2db67fa205
-  data.tar.gz: 7d374a240cac71d3cd65d1422fbb983e1b4e10f6d8e1096ad9a4ed973d521229a9bf078db1c7a86e8862c3ad596f95e7f4899e9c0e11751339691e1006cd3dbd
+  metadata.gz: b0393c336cc05254ae08dc757f449fda523f6caaaff7a65241b466d468af7ef9e595a95ea56d2b6a3934dc406bf9414b0da2bc2c06ea77c8e7d89c61abb87331
+  data.tar.gz: d2ac537a78af198168ff50006a8d74ed880f0103f2cce91045c48578dbbd7e44815205f37d7167c206c8cd468ee92bad35caca6d4af96700aaf2b66950e07ff0

data/lib/dmp/dmp_id_handler.rb

@@ -10,28 +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}"
-          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
-        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

@@ -70,7 +70,7 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
-      return { status: 404, error: MSG_NOT_FOUND } if response[:item].nil?
+      return { status: 404, error: MSG_NOT_FOUND } if response.fetch(:item, []).empty?
 
       { status: 200, items: [response[:item]] }
     rescue Aws::Errors::ServiceError => e
@@ -129,11 +129,14 @@ p "PUTTING ITEM:"
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
+      # Fetch the newly created record
+      response = find_by_pk(p_key: p_key, s_key: Dmp::MetadataHandler::LATEST_VERSION)
+      return { status: 500, error: MSG_DEFAULT } unless response[:status] == 200
 
 p 'CREATED!?'
-pp response.data
+pp response[:items]
 
-      { status: 201, items: [response.data] }
+      { status: 201, items: response[:items] }
     rescue Aws::DynamoDB::Errors::DuplicateItemException
       { status: 405, error: MSG_EXISTS }
     rescue Aws::Errors::ServiceError => e
@@ -176,7 +179,7 @@ p ''
 
       json = splice_json(original_version: version_result[:items].first&.item, new_version: json)
 
-p ''
+# p ''
 p "AFTER:"
 pp json
 
@@ -253,7 +256,8 @@ pp json
     # Attempt to find the DMP item by its 'is_metadata_for' :dmproadmap_related_identifier
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def find_by_dmphub_provenance_identifier(json:)
-      return { status: 400, error: MSG_DEFAULT } if json.nil? || json.fetch('dmp_id', {})['identifier'].nil?
+      return { status: 400, error: MSG_DEFAULT } if json.nil? ||
+                                                    json.fetch('dmp_id', {})['identifier'].nil?
 
 p "FINDING BY PROVENANCE ID: #{json['dmp_id']['identifier']}"
 
@@ -304,7 +308,7 @@ p 'PREREGISTER DMP ID:'
       # 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}"
+      "#{Dmp::MetadataHandler::PK_DMP_PREFIX}#{Dmp::DmpIdHandler.dmp_id_base_url}#{dmp_id}"
     end
 
     # Convert the latest version into a historical version

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.7
+  version: 0.3.0
 platform: ruby
 authors:
 - briri