uc3-dmp-id 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a0a7c8a7c2ec3b7bfdc0051c323b85ba6f7bb14aa0bc1f77e499b7682b3814
-  data.tar.gz: 9bb5fa376caa1d07bd243cebad4b5757771eb996a4723c200366c034fdf56b2c
+  metadata.gz: 7305cd9930a1eb2f2feb56fa439ef8ebfc95ce5550184f81801989b570b9e56e
+  data.tar.gz: dafe80d52cb7ef18b1dc63c15708955eb8abb608bace639d29df2cbcd96e0aaf
 SHA512:
-  metadata.gz: 8b8ff1171c5127af8fedbfe85bf2c74b4a61f25dc4bab73e42fa1903bbe36c9a20adb0f9db2b1906c6542f7172496ea9173b05c047b20392577d5cc9341002db
-  data.tar.gz: '079687ec9e07dddde7afcbcd9d1b6dc0b3606276f735e4040ca0183e378f1bc0c72017747d48dde140c32b922e7ce6825afc5b3961d6b93503ce4c2052226495'
+  metadata.gz: 2b14d04b52398da535ef787b15e5f883f9fdf93a6adb1adf34c5e82c459f13c40f481fb214bb17f770502e06a8fe67e3a6692359a2a8e96a5a6918dcd2e134c3
+  data.tar.gz: 3c9eded9447bc3fd9a4b3f2168bc289d812b5b1613a86e4e407ba83ad402be23ca4fd01d113373e93f23c951d1d96d36d6b75863cbad14be27c47376cc9f2ebc

data/lib/uc3-dmp-id/finder.rb

@@ -60,17 +60,22 @@ module Uc3DmpId
       def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, debug: false)
         raise Uc3DmpIdFinderError, MSG_MISSING_PK if p_key.nil?
 
-        s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.strip.empty?
+        s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.to_s.strip.empty?
+
+puts "PK: #{p_key}, SK: #{s_key}"
 
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.get_item(
           key: {
             PK: Helper.append_pk_prefix(p_key: p_key),
-            SK: s_key.nil? || s_key.strip.empty? ? Helper::DMP_LATEST_VERSION : s_key
+            SK: s_key
           }
         )
         return resp unless resp.is_a?(Hash)
 
+puts "FETCHED:"
+puts resp
+
         dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
         return nil if resp['dmp']['PK'].nil?
 
@@ -112,10 +117,16 @@ module Uc3DmpId
       def _append_versions(p_key:, dmp:, client: nil, debug: false)
         return dmp if p_key.nil? || !dmp.is_a?(Hash) || dmp['dmp'].nil?
 
+puts "FETCHING VERSIONS"
+
         results = versions(p_key: p_key, client: client, debug: debug)
         return dmp unless results.length > 1
 
-        versions = results.map do |version|
+        versions = results.map do |ver|
+
+puts version
+
+          version = ver['dmp'].nil? ? JSON.parse({ dmp: ver }.to_json) : ver
           next if version.fetch('dmp', {})['modified'].nil?
 
           timestamp = version['dmp']['modified']
@@ -125,6 +136,10 @@ module Uc3DmpId
           }
         end
         dmp['dmp']['dmphub_versions'] = JSON.parse(versions.to_json)
+
+puts "AFTER APPENDING VERSIONS:"
+puts dmp
+
         dmp
       end
       # rubocop:enable Metrics/AbcSize

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Brian Riley