dmp-dynamo_adapter 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4c901b97437913b47803234f1f6bd80dfe048e307c452ce80b174f465d6de2
-  data.tar.gz: f5583c6531e487250ba8ccb0acf7e600a9ca46f7e8fee702bbc35bc5085e7198
+  metadata.gz: 33302af56b5e3b2046ced1ca5b826a0b52abd2c7c57ff1ac738e7f21f58642b6
+  data.tar.gz: a484cdc69656ce174c7d2319d615b44b7ac1115026f164e027b1cf1e67f04a78
 SHA512:
-  metadata.gz: 11246b4c0a980ffd9b4b43b4e9566f1ed29dd4f6db4068a96539cbd5d615bae24a1d720efba00a1bbc54ed3c38fdfa2b0405fd69ce6f1c6a0e2cdd6b73cf4383
-  data.tar.gz: 9fa961d5cf6405334791cebb57713265dccf5856d8bb853cefa37f0d0a2ab2040dfc88d6678718fae15603c82253d37d26df59d721c69edce529076e5ce0557b
+  metadata.gz: 7ad5921565684cef3a980ca8b678c2d6a5d753a98dca73f120396d81dfb55c388c55e06f91ad23741f3344537426e4a84ccae4d5aa0af5728fd9c4c2d0e2ff98
+  data.tar.gz: c1d5f67f064806bb4a002ce11e584d40879868df6ff1037c52706640843297a58f922e140ece87df046d743a857a21da24b10c4bb20f1e34a37432cf9ad3821a

data/lib/dmp/dmp_id_handler.rb

@@ -16,8 +16,10 @@ module Dmp
       # 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?

data/lib/dmp/dynamo_adapter.rb

@@ -105,16 +105,28 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
 
       # Try to find it first
       result = find_by_json(json: json)
-      return { status: 500, error: MSG_DEFAULT } if result[:status] == 500
+
+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?
 
       # allocate a DMP ID
       p_key = Dmp::DmpIdHandler.preregister_dmp_id
+
+p "PRE REGISTERED DMP ID: #{p_key.inspect}"
+
       return { status: 500, error: MSG_NO_DMP_ID } if p_key.nil?
 
       # Add the DMPHub specific attributes and then save
       json = Dmp::MetadataHandler.annotate_json(provenance: @provenance, json: json, p_key: p_key)
+
+p "ANNOTATED:"
+pp json
+
+p "PUTTING ITEM:"
       response = @client.put_item(
         {
           table_name: ENV['AWS_DYNAMO_TABLE_NAME'],
@@ -146,7 +158,7 @@ pp response.data
 
       # Try to find it first
       result = find_by_json(json: json)
-      return { status: 500, error: MSG_DEFAULT } if result[:status] == 500
+      return { status: 500, error: result.fetch(:error, MSG_DEFAULT) } if result[:status] == 500
 
       dmp = result[:items].first&.item
       return { status: 404, error: MSG_NOT_FOUND } if dmp.nil?
@@ -204,7 +216,7 @@ pp json
 
       # Try to find it first
       result = find_by_json(json: json)
-      return { status: 500, error: MSG_DEFAULT } if result[:status] == 500
+      return { status: 500, error: result.fetch(:error, MSG_DEFAULT) } if result[:status] == 500
       # Abort if NOT found
       return { status: 404, error: MSG_NOT_FOUND } unless result[:status] == 200 && result.fetch(:items, []).any?
 
@@ -262,12 +274,13 @@ p "FINDING BY PROVENANCE ID: #{json['dmp_id']['identifier']}"
           },
           filter_expression: 'SK = :version',
           expression_attribute_values: {
-            ':SK': Dmp::MetadataHandler::LATEST_VERSION
+            ':version': Dmp::MetadataHandler::LATEST_VERSION
           },
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
 
+p "RESPONSE:"
 pp response.data
 
       return { status: 404, error: MSG_NOT_FOUND } if response.nil? || response[:Count] <= 0

data/lib/dmp/metadata_handler.rb

@@ -60,6 +60,8 @@ module Dmp
       def annotate_json(provenance:, p_key:, json:)
         return nil if provenance.nil? || p_key.nil? || json.nil?
 
+p "ANNOTATING METADATA:"
+
         # Fail if the :PK does not match the :dmp_id if the json has a :PK
         id = Dmp::DmpIdHandler.dmp_id_to_pk(json: json.fetch('dmp_id', {}))
         id = nil if id != p_key && !json['PK'].nil?

metadata

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