dmp-dynamo_adapter 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6132be6e3e6a89db5b11dd95f62ed7470516e3b4b7ddb0c54fbe7d70e0b2b51c
-  data.tar.gz: 1bf763c8a0138b9d262c1fff1c99661f74be833b83de2f6b778f987f183d32c3
+  metadata.gz: 9418816d26847581bce0424f326d1b7d65947b2aa3df952c2d8904984229b18c
+  data.tar.gz: 3e7a9d4819f987dc3ae51a699b88321182d28705d776e48780aedba1d5995412
 SHA512:
-  metadata.gz: bb8e0fdcef792b5bfb86fc8c6dc3883c63088ba3ff35ec312e00a078a58d8bb4044060aafb99e1e48b8d21bccc95b13bf0e505b227427c445e6c86fbc9fbd7f5
-  data.tar.gz: ceb2ba37d8ef16facf72dced05b2a686d9a55ad0e09ce4b8d825c95e03d79482d2c222f3c6fed21ab08c1a7b33209a14246a9ba322747d80cfc6d23ef891884a
+  metadata.gz: 9abe8d680a8dce95cf71d50e14b8fc9c954bb04bdaaa3d080b80dbb639b4f098c7c5b976610a7bff5a37c7ed48c68f330b4e315df93663ec48ffb3a5d2a39119
+  data.tar.gz: 1378240d137ae3afd8e089d0337d2322d8a8406fc93d3027b14870c6a2a0f0c15087b7b06bd5dd5f158ef93996e21103f0c4488cf4eae77d6cf3607cc8159931

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,10 @@ 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(
         {
           table_name: ENV['AWS_DYNAMO_TABLE_NAME'],
@@ -66,11 +70,14 @@ module Dmp
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
-      return { status: 404, error: MSG_NOT_FOUND } if response.items.empty?
 
-      { status: 200, items: response.items.map(&:item).compact.uniq }
-    rescue Aws::Errors::ServiceError
-      { status: 500, error: MSG_DEFAULT }
+pp response.data
+
+      return { status: 404, error: MSG_NOT_FOUND } if response[:item].nil?
+
+      { 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
@@ -81,7 +88,7 @@ module Dmp
 
       pk = json['PK']
       # Translate the incoming :dmp_id into a PK
-      pk = DmpIdHandler.dmp_id_to_pk(json: json.fetch('dmp_id', {})) if pk.nil?
+      pk = Dmp::DmpIdHandler.dmp_id_to_pk(json: json.fetch('dmp_id', {})) if pk.nil?
 
       # find_by_PK
       response = find_by_pk(p_key: pk, s_key: json['SK']) unless pk.nil?
@@ -99,6 +106,8 @@ module Dmp
       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)
@@ -107,7 +116,7 @@ module Dmp
       return { status: 400, error: MSG_EXISTS } if result[:items].any?
 
       # allocate a DMP ID
-      p_key = preregister_dmp_id
+      p_key = Dmp::DmpIdHandler.preregister_dmp_id
       return { status: 500, error: MSG_NO_DMP_ID } if p_key.nil?
 
       # Add the DMPHub specific attributes and then save
@@ -122,8 +131,8 @@ module Dmp
       { status: 201, items: response.items.map(&:item).compact.uniq }
     rescue Aws::DynamoDB::Errors::DuplicateItemException
       { status: 405, error: MSG_EXISTS }
-    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, Metrics/CyclomaticComplexity
 
@@ -180,8 +189,8 @@ pp json
       { status: 200, items: response.items.map(&:item).compact.uniq }
     rescue Aws::DynamoDB::Errors::DuplicateItemException
       { status: 405, error: MSG_EXISTS }
-    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/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
@@ -225,8 +234,8 @@ pp json
         }
       )
       { 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, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
@@ -241,6 +250,8 @@ pp json
     def find_by_dmphub_provenance_identifier(json:)
       return { status: 400, error: MSG_DEFAULT } if json.nil? || json.fetch('dmp_id', {})['identifier'].nil?
 
+p "FINDING BY PROVENANCE ID: #{json['dmp_id']['identifier']}"
+
       response = @client.query(
         {
           table_name: ENV['AWS_DYNAMO_TABLE_NAME'],
@@ -262,8 +273,8 @@ pp json
 
       # If we got a hit, fetch the DMP and return it.
       find_by_pk(p_key: response.items.first.item[:PK])
-    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, Metrics/AbcSize
 
@@ -292,8 +303,8 @@ pp json
       return { status: 404, error: MSG_NOT_FOUND } if response.nil? || response.items.empty?
 
       { 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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmp-dynamo_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - briri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb