dmp-dynamo_adapter 0.1.9 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38cf33054966d1ad251334ff69c9c120810f574c68366675a3b067c63976518
-  data.tar.gz: efd50976eedd2b51a7c2a3877fc949b0fb99ce4162ee8f513f8edcf0385a3bd2
+  metadata.gz: 482c56531b1bce877f93b66efbdc8aefc4b2c120b5d81eb3713035dfb546149d
+  data.tar.gz: bd9680232b0bbfcf92bdeec0b56ec62f335ccefb52acb9d902fc02e00e73659c
 SHA512:
-  metadata.gz: a14dea8426ac97c743d420f3952a5d7e56cb6a95749e9f32390ca74791ac085ebdfe90381a0fd990cf3547bb3d5fcae5b78300533871a9d11892f3074ed005f8
-  data.tar.gz: f35b4a2a51461faf6023ec3a08f973c88f7bd379b13037e7df65cb703368bf39ca09d35ddb289e23d74c0b7dec95e1043cb3f9a85e57880d03e3a253d3a17f83
+  metadata.gz: 4a2e6307f60b392621225539e2065633a64859b8dbc60bc83fa1cb559b6960d5f581eace2ada534bbce85d5bf009502642f9065e27fff683d57f967298fe415e
+  data.tar.gz: dfd6fdaaf576d91b96fcdb37a7ce6f060a66f8d7ae4511205f08106259eecb6104a65f024cbe4c3ebc07e9221e83c266b627caeef7bc0827fb6f85524d6b082e

data/lib/dmp/dynamo_adapter.rb

@@ -70,9 +70,9 @@ 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 }
+      { status: 200, items: [response[:item]] }
     rescue Aws::Errors::ServiceError => e
       { status: 500, error: "#{MSG_DEFAULT} - #{e.message}" }
     end
@@ -103,12 +103,9 @@ 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
+      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?
 
@@ -125,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
@@ -145,7 +146,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?
@@ -203,7 +204,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?
 
@@ -266,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.9
+  version: 0.2.2
 platform: ruby
 authors:
 - briri