dmp-dynamo_adapter 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9418816d26847581bce0424f326d1b7d65947b2aa3df952c2d8904984229b18c
-  data.tar.gz: 3e7a9d4819f987dc3ae51a699b88321182d28705d776e48780aedba1d5995412
+  metadata.gz: 1ca8afd4ec83d2f0b665b3521e0bc9ebe7d1fbd051dea63676d9b4abaadc66ad
+  data.tar.gz: 8dbddd4cd81b89d25561948cf519a1fb27069d9aea10c9ca06956e74b4f7d243
 SHA512:
-  metadata.gz: 9abe8d680a8dce95cf71d50e14b8fc9c954bb04bdaaa3d080b80dbb639b4f098c7c5b976610a7bff5a37c7ed48c68f330b4e315df93663ec48ffb3a5d2a39119
-  data.tar.gz: 1378240d137ae3afd8e089d0337d2322d8a8406fc93d3027b14870c6a2a0f0c15087b7b06bd5dd5f158ef93996e21103f0c4488cf4eae77d6cf3607cc8159931
+  metadata.gz: 28e8eb60875cc65bbbbc660a4df24a9848bedb784c20f6b5345686d39e8ceb49235b7e3e2703f37fa68e04317c24d5c06758291d4707987f82095b1d4ba70824
+  data.tar.gz: 6482832fe3c392bd302832bad1722f331890b0b3c4892c913fea2b33fb39f2678cfe4e6e9d8c80ca5cfd9ce7345760db41f93cf2bb7726cfcc0d7edd7728cc31

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

@@ -70,9 +70,6 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
-
-pp response.data
-
       return { status: 404, error: MSG_NOT_FOUND } if response[:item].nil?
 
       { status: 200, items: [response[:item]] }
@@ -106,21 +103,30 @@ pp response.data
       json = prepare_json(json: json)
       return { status: 400, error: MSG_DEFAULT } if json.nil? || @provenance.nil?
 
-p "FINDING BY JSON"
-pp json
-
       # 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'],
@@ -128,7 +134,11 @@ pp json
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
-      { status: 201, items: response.items.map(&:item).compact.uniq }
+
+p 'CREATED!?'
+pp response.data
+
+      { status: 201, items: [response.data] }
     rescue Aws::DynamoDB::Errors::DuplicateItemException
       { status: 405, error: MSG_EXISTS }
     rescue Aws::Errors::ServiceError => e
@@ -148,7 +158,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
 
       dmp = result[:items].first&.item
       return { status: 404, error: MSG_NOT_FOUND } if dmp.nil?
@@ -206,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?
 
@@ -269,10 +279,15 @@ p "FINDING BY PROVENANCE ID: #{json['dmp_id']['identifier']}"
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
-      return { status: 404, error: MSG_NOT_FOUND } if response.nil? || response.items.empty?
+
+p "RESPONSE:"
+pp response.data
+
+      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.items.first.item[:PK])
+      find_by_pk(p_key: response.fetch(:LastEvaluatedKey, {})[:HashKeyElement],
+                 s_key: response.fetch(:LastEvaluatedKey, {})[:RangeKeyElement])
     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.0
+  version: 0.2.3
 platform: ruby
 authors:
 - briri