dmp-dynamo_adapter 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482c56531b1bce877f93b66efbdc8aefc4b2c120b5d81eb3713035dfb546149d
-  data.tar.gz: bd9680232b0bbfcf92bdeec0b56ec62f335ccefb52acb9d902fc02e00e73659c
+  metadata.gz: d0b673c5ab8af1a4ada8c4f14be3c2543c7af6e16ad3fbe34a31552451fea8a3
+  data.tar.gz: 77484e5b3f58fd9088b635ab2e9fcd47b493aeb4fefc46618daec56a6dd993aa
 SHA512:
-  metadata.gz: 4a2e6307f60b392621225539e2065633a64859b8dbc60bc83fa1cb559b6960d5f581eace2ada534bbce85d5bf009502642f9065e27fff683d57f967298fe415e
-  data.tar.gz: dfd6fdaaf576d91b96fcdb37a7ce6f060a66f8d7ae4511205f08106259eecb6104a65f024cbe4c3ebc07e9221e83c266b627caeef7bc0827fb6f85524d6b082e
+  metadata.gz: b81abb15e34a2e6ca1d5dc0405b98bdae243b6099cca1f2c83735ea3b540c293059cb5d652d77095b899e2ac04b374f319dcdd6842f32a4b5dd76681b8bff083
+  data.tar.gz: 29a757ae20c3888e0f9c5dd8fdd17b2b77b20c2af5c1b9c0a14e003bf55054d371c57a484730088d4d50decc5e95e9f090135070bc3a6d6d8f6df495bc4c5bf2

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)
+
+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'],
@@ -262,19 +274,20 @@ 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
+      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

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