dmp-dynamo_adapter 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6132be6e3e6a89db5b11dd95f62ed7470516e3b4b7ddb0c54fbe7d70e0b2b51c
-  data.tar.gz: 1bf763c8a0138b9d262c1fff1c99661f74be833b83de2f6b778f987f183d32c3
+  metadata.gz: b0bf9a1c860911aa89f60a60dce597a07c6721b5eec655d45b97a8ee394249c8
+  data.tar.gz: 144963e2c761acbb18285f508648c9940b73ba0c04f18c96102da4530caf86b1
 SHA512:
-  metadata.gz: bb8e0fdcef792b5bfb86fc8c6dc3883c63088ba3ff35ec312e00a078a58d8bb4044060aafb99e1e48b8d21bccc95b13bf0e505b227427c445e6c86fbc9fbd7f5
-  data.tar.gz: ceb2ba37d8ef16facf72dced05b2a686d9a55ad0e09ce4b8d825c95e03d79482d2c222f3c6fed21ab08c1a7b33209a14246a9ba322747d80cfc6d23ef891884a
+  metadata.gz: ad012db60a41f6c3e1ec979df1ce3410de618e8e70efe43897ace24ea0fc5aed6d29e95c7fc2282de840f58b89849883ff4fe738c980c66d878d9c27ba39b5eb
+  data.tar.gz: 908957cd229392f7d2a3a0d4b127cb80db7bf01cfca9da082fcc1dc12f600e72bfcac89aee21cba6da7296506dc5c13acfbd3a84d4e6a0929f291f0def1db9f2

data/lib/dmp/dynamo_adapter.rb

@@ -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?
 
+p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
+
       response = @client.get_item(
         {
           table_name: ENV['AWS_DYNAMO_TABLE_NAME'],
@@ -81,7 +83,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 +101,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 +111,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 +126,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 +184,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 +229,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 +245,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 +268,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 +298,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.1.8
 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