dmp-dynamo_adapter 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0bf9a1c860911aa89f60a60dce597a07c6721b5eec655d45b97a8ee394249c8
-  data.tar.gz: 144963e2c761acbb18285f508648c9940b73ba0c04f18c96102da4530caf86b1
+  metadata.gz: 4c4c901b97437913b47803234f1f6bd80dfe048e307c452ce80b174f465d6de2
+  data.tar.gz: f5583c6531e487250ba8ccb0acf7e600a9ca46f7e8fee702bbc35bc5085e7198
 SHA512:
-  metadata.gz: ad012db60a41f6c3e1ec979df1ce3410de618e8e70efe43897ace24ea0fc5aed6d29e95c7fc2282de840f58b89849883ff4fe738c980c66d878d9c27ba39b5eb
-  data.tar.gz: 908957cd229392f7d2a3a0d4b127cb80db7bf01cfca9da082fcc1dc12f600e72bfcac89aee21cba6da7296506dc5c13acfbd3a84d4e6a0929f291f0def1db9f2
+  metadata.gz: 11246b4c0a980ffd9b4b43b4e9566f1ed29dd4f6db4068a96539cbd5d615bae24a1d720efba00a1bbc54ed3c38fdfa2b0405fd69ce6f1c6a0e2cdd6b73cf4383
+  data.tar.gz: 9fa961d5cf6405334791cebb57713265dccf5856d8bb853cefa37f0d0a2ab2040dfc88d6678718fae15603c82253d37d26df59d721c69edce529076e5ce0557b

data/lib/dmp/dynamo_adapter.rb

@@ -49,8 +49,8 @@ module Dmp
         }
       )
       { status: 200, items: response.items.map(&:item).compact.uniq }
-    rescue Aws::Errors::ServiceError
-      { status: 500, error: MSG_DEFAULT }
+    rescue Aws::Errors::ServiceError => e
+      { status: 500, error: "#{MSG_DEFAULT} - #{e.message}" }
     end
     # rubocop:enable Metrics/MethodLength
 
@@ -58,6 +58,8 @@ module Dmp
     def find_by_pk(p_key:, s_key: Dmp::MetadataHandler::LATEST_VERSION)
       return { status: 404, error: MSG_NOT_FOUND } if p_key.nil?
 
+      s_key = Dmp::MetadataHandler::LATEST_VERSION if s_key.nil? || s_key.strip == ''
+
 p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
 
       response = @client.get_item(
@@ -68,11 +70,11 @@ 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.items.empty?
+      return { status: 404, error: MSG_NOT_FOUND } if response[:item].nil?
 
-      { status: 200, items: response.items.map(&:item).compact.uniq }
-    rescue Aws::Errors::ServiceError
-      { status: 500, error: MSG_DEFAULT }
+      { status: 200, items: [response[:item]] }
+    rescue Aws::Errors::ServiceError => e
+      { status: 500, error: "#{MSG_DEFAULT} - #{e.message}" }
     end
 
     # Find a DMP based on the contents of the incoming JSON
@@ -101,9 +103,6 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
       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
@@ -123,7 +122,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
@@ -264,10 +267,14 @@ 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?
+
+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

metadata

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