dmp-dynamo_adapter 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73072fe825acd0df7976f0b387ca8a441beb225ff387cc8390d8e3c289a028b5
-  data.tar.gz: f6e31294429df6ca86914a4f7ac8157fee8684ed03fac7fec521858384d649de
+  metadata.gz: b0bf9a1c860911aa89f60a60dce597a07c6721b5eec655d45b97a8ee394249c8
+  data.tar.gz: 144963e2c761acbb18285f508648c9940b73ba0c04f18c96102da4530caf86b1
 SHA512:
-  metadata.gz: 703bb8718f53211b4ee6f4d31fd34ada4a955ee316d86b7a78049ad760039c75e351d5a808ce41bb4d2983ee0c21b9372af3089cd322247398cbda75f3516491
-  data.tar.gz: c67e27dc354b2206a86f334e4c9a181208587b4be885e71f3644543a3f5219e3afe97a080f2386a9dec3dd633d4dcd7c1ec12c53324f470ffc39b6584700b8e1
+  metadata.gz: ad012db60a41f6c3e1ec979df1ce3410de618e8e70efe43897ace24ea0fc5aed6d29e95c7fc2282de840f58b89849883ff4fe738c980c66d878d9c27ba39b5eb
+  data.tar.gz: 908957cd229392f7d2a3a0d4b127cb80db7bf01cfca9da082fcc1dc12f600e72bfcac89aee21cba6da7296506dc5c13acfbd3a84d4e6a0929f291f0def1db9f2

data/lib/dmp/dmp_id_handler.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'securerandom'
-reequire 'dmp/metadata_handler'
+require 'dmp/metadata_handler'
 
 module Dmp
   # Methods that handle PK generation

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 = 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 +101,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 +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
@@ -121,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
 
@@ -179,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
 
@@ -224,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
 
@@ -240,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'],
@@ -261,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
 
@@ -291,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.5
+  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