uc3-dmp-id 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311e98d2bb2766b13451da262a40a971bf6bd277a9b20e08a370b6bc85736c01
-  data.tar.gz: f44522707fdc652d66d691807d078a07e1f4749eb5bd8c7710e3cf8bfa764f2f
+  metadata.gz: ba5ea607a46a54a678d88187f9aa1e1afb49b691a7586a01b8f22e1502771865
+  data.tar.gz: f24f181d33ae842057fdd2bc95002baa41cdc75040e37ce4904502ecbccf120f
 SHA512:
-  metadata.gz: dec0556fc472a139b1ec25f502eb1a4c1bbf6a533158697b4f554f5211ff69b8dc42cf65accc7ceb8b4d10f4ec792f972bd7a28352fad89b0f3df21ad2600cb0
-  data.tar.gz: '087af9131a1bcfee8ddfe93f6202cf0f9d38cd9151a6de00c3c50b783eade3775e42a6695b50b5963e2e70f881444ae3f2d4f02a1f9061b4fa9d87478dac2931'
+  metadata.gz: 769b2512b7d4b2d7a18b7a11863b8eb0b0870b3ab5d23301386830bfd9db9e9630f887670dfda30031b541ff968ec7b178248ab5ffe9308b7ec59e81a2321f21
+  data.tar.gz: bd200b2ad45a7a202a86ef2eeac50834b19ab4713bd200185f4fc8f663c9668a8d2afacfe3a5c6c54d5bae47efb556b39d9d75ff926abdc6966a42a7de169842

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

@@ -34,10 +34,6 @@ module Uc3DmpId
           scan_index_forward: false
         }
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
-
-puts "VERSION SEARCH:"
-puts args
-
         client.query(args: args, debug: debug)
       end
 
@@ -83,7 +79,8 @@ puts resp
         dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
         return nil if dmp['dmp']['PK'].nil?
 
-        _append_versions(p_key: dmp['dmp']['PK'], dmp: dmp, client: client, debug: debug)
+        dmp = _append_versions(p_key: dmp['dmp']['PK'], dmp: dmp, client: client, debug: debug)
+        cleanse_dmp_json(json: dmp)
       end
 
       # Attempt to find the DMP item by the provenance system's identifier
@@ -121,29 +118,17 @@ puts resp
       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 |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']
+          next if ver['modified'].nil?
           {
-            timestamp: timestamp,
-            url: "#{Helper.api_base_url}dmps/#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{timestamp}"
+            timestamp: ver['modified'],
+            url: "#{Helper.api_base_url}dmps/#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{ver['modified']}"
           }
         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.17'
+  VERSION = '0.0.19'
 end

metadata

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