uc3-dmp-dynamo 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3537f8c5fd1ccbf238e6f1229eba643ae138e5e2c5c0231a77bd04981a4e11
-  data.tar.gz: a62767c144ff42c1c1b8e07b526fb6bb804d1a23a58aaa7585ec0c5a4444b4e7
+  metadata.gz: b0b0c89e4e576fc8416abb7a2b1f8d131bc5b75107c387a81d7f60e416ef0887
+  data.tar.gz: 3a278bf8304c366ee9ec4768e174b5918d4958c008d8106e58166dfac9a30892
 SHA512:
-  metadata.gz: c0bd6548948a7171ad141987d0826b20af106d796ac42ff3ef2327ddb1acf6fd9003e8cdd9abecbf23f791d2ea4387fd169294cbf1582cb7fa72a7bc8c6e7846
-  data.tar.gz: 69578c3575ba0984ad86330c2179086f7ce930ba2bb05a0e158241796733a112d3099b0b0a2ab12e49ee4f150ebcb9b112eee1f345bde45e6cf1e586c0df0768
+  metadata.gz: 84fc086e335afb9eed5c8acf57987658bd2580baf2dfa8bcb3edd44d0bdb0d38e0e8d68800e0ec3530706039894984af6bac882548389fa4c8139d915330081d
+  data.tar.gz: 1e1a9900aadbd51119408dfdfa0de0d66b0eb1cf588de109222587c7e63581f8bca87b9c6e5c1cb2b9c184c11d6316d7bb4ae6a661b550c03b81f2a790aeac18

data/lib/uc3-dmp-dynamo/client.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-
 # TODO: Be sure to update the API functions so that they call cleanse_dmp_json before
 #       calling Uc3DmpApiCore::Responder.respond !!!!!!!!!!
 
-
 module Uc3DmpDynamo
-  class Uc3DmpDynamoError < StandardError; end
+  class ClientError < StandardError; end
 
   # Helper functions for working with Dynamo JSON
   class Client
@@ -18,33 +16,35 @@ module Uc3DmpDynamo
 
     attr_accessor :connection, :table
 
-    def initialize(**args)
-      @table = ENV['DYNAMO_TABLE']
-      raise Uc3DmpDynamoError, MSG_MISSING_TABLE if @table.nil?
+    def initialize(**_args)
+      @table = ENV.fetch('DYNAMO_TABLE', nil)
+      raise ClientError, MSG_MISSING_TABLE if @table.nil?
 
       @connection = Aws::DynamoDB::Client.new(region: ENV.fetch('AWS_REGION', 'us-west-2'))
     end
 
     # Fetch a single item
+    # rubocop:disable Metrics/AbcSize
     def get_item(key:, debug: false)
-      raise Uc3DmpDynamoError, MSG_INVALID_KEY unless key.is_a?(Hash)
+      raise ClientError, MSG_INVALID_KEY unless key.is_a?(Hash) && !key[:PK].nil?
 
       resp = @connection.get_item(
         { table_name: @table,
           key: key,
           consistent_read: false,
-          return_consumed_capacity: debug ? 'TOTAL' : 'NONE'
-        }
+          return_consumed_capacity: debug ? 'TOTAL' : 'NONE' }
       )
+
       # If debug is enabled then write the response to the LogWriter
       if debug
         puts "#{SOURCE} => get_item - #{key}"
         puts resp[:item].first.inspect
       end
-      resp[:item].first
+      resp[:item].is_a?(Array) ? resp[:item].first : resp[:item]
     rescue Aws::Errors::ServiceError => e
-      raise Uc3DmpDynamoError, MSG_DYNAMO_ERROR % { msg: e.message, trace: e.backtrace }
+      raise ClientError, format(MSG_DYNAMO_ERROR, msg: e.message, trace: e.backtrace)
     end
+    # rubocop:enable Metrics/AbcSize
 
     # Perform a table scan if a filter was specified.
     # For example:
@@ -52,9 +52,9 @@ module Uc3DmpDynamo
     #    projection_expression: 'title, dmp_id, modified'
     #
     # See the DynamoDB docs for examples of key_conditions and projection_expressions
-    def query(debug: false, **args)
-      raise Uc3DmpDynamoError, MSG_INVALID_KEY unless args[:key_conditions].is_a?(Hash) &&
-                                                      !args[:key_conditions].keys.empty?
+    # rubocop:disable Metrics/AbcSize
+    def query(args:, debug: false)
+      raise ClientError, MSG_INVALID_KEY unless args.is_a?(Hash) && args.fetch(:key_conditions, {}).any?
 
       hash = {
         table_name: @table,
@@ -63,7 +63,7 @@ module Uc3DmpDynamo
         return_consumed_capacity: debug ? 'TOTAL' : 'NONE'
       }
       # Look for and add any other filtering or projection args
-      %i[filter_expression, expression_attribute_values, projection_expression, scan_index_forward].each do |key|
+      %i[filter_expression expression_attribute_values projection_expression scan_index_forward].each do |key|
         next if args[key.to_sym].nil?
 
         hash[key.to_sym] = args[key.to_sym]
@@ -72,13 +72,17 @@ module Uc3DmpDynamo
       resp = @connection.query(hash)
       # If debug is enabled then write the response to the LogWriter
       if debug
-        msg = "query - args: #{args}"
-        puts "#{SOURCE} => query - args: #{args.inspect}"
+        puts "#{SOURCE} => query - args: #{hash.inspect}"
         puts resp.items.inspect
       end
-      resp.items
+
+puts "QUERY RESULT:"
+puts resp.items.first.inspect
+
+      resp.items.any? ? resp.items.map(&:item) : []
     rescue Aws::Errors::ServiceError => e
-      raise Uc3DmpDynamoError, MSG_DYNAMO_ERROR % { msg: e.message, trace: e.backtrace }
+      raise ClientError, format(MSG_DYNAMO_ERROR, msg: e.message, trace: e.backtrace)
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/uc3-dmp-dynamo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpDynamo
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
 end

data/lib/uc3-dmp-dynamo.rb

@@ -5,7 +5,7 @@ require 'aws-sdk-dynamodb'
 
 require 'uc3-dmp-dynamo/client'
 
+# DynamoDB Table helpers for DMPTool
 module Uc3DmpDynamo
-
 end
 # rubocop:enable Naming/FileName

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json