dmp-dynamo_adapter 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe879d1aefc8db1c3b1a8160171c2f3cd8f6ee1986d494abf69083af19a6133
-  data.tar.gz: 58fd4512a6c72bfaee714cfb19be7c9dd3f9a81b2df1742f5a7a35ff6b5fa045
+  metadata.gz: a38cf33054966d1ad251334ff69c9c120810f574c68366675a3b067c63976518
+  data.tar.gz: efd50976eedd2b51a7c2a3877fc949b0fb99ce4162ee8f513f8edcf0385a3bd2
 SHA512:
-  metadata.gz: 52c93f6323e77810246cceeba743a71866872931716f82b1dfe482ff613d1361ef596deed64ff8f22eec32ea38c7679d0c64916c7e1941d076eed1357537ac37
-  data.tar.gz: 01f5d12e5227007fc434520e135b82edbbb4601a517c6a9898cf510fe2dcca9163900145fb50b19d69a40cdc8e3bf81fd345c0e0361d24df2a650ab15a9bf2cb
+  metadata.gz: a14dea8426ac97c743d420f3952a5d7e56cb6a95749e9f32390ca74791ac085ebdfe90381a0fd990cf3547bb3d5fcae5b78300533871a9d11892f3074ed005f8
+  data.tar.gz: f35b4a2a51461faf6023ec3a08f973c88f7bd379b13037e7df65cb703368bf39ca09d35ddb289e23d74c0b7dec95e1043cb3f9a85e57880d03e3a253d3a17f83

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'],
@@ -69,8 +73,8 @@ module Dmp
       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 }
+    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 +85,7 @@ module Dmp
 
       pk = json['PK']
       # Translate the incoming :dmp_id into a PK
-      pk = pk_from_dmp_id(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 +103,9 @@ 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)
       return { status: 500, error: MSG_DEFAULT } if result[:status] == 500
@@ -106,7 +113,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
@@ -121,8 +128,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
 
@@ -179,8 +186,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
 
@@ -224,8 +231,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
 
@@ -240,6 +247,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'],
@@ -261,8 +270,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
 
@@ -291,8 +300,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.6
+  version: 0.1.9
 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