uc3-dmp-id 0.0.93 → 0.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effd6e9f621b4a0a2ff038e01a9db04f39284eebe520c18df70b6a224984e030
-  data.tar.gz: be8087477ee5ae03e4c82b24cecf4f8b92b5fb4fa090520277738b0538d3324c
+  metadata.gz: 66da5763a8775630aa772cda55e95ea3a851b0f64e28d0c37c35e2c31d96d57e
+  data.tar.gz: '08ad0dcb0490ac289b674fa9d8a8fdf704a1f9a50020d42fa10d208a34f86771'
 SHA512:
-  metadata.gz: 31d8ab61ec9adef5daba45bb25d26bfbb5559b5ac468bc3b05231e814e24e0670d84644040006ab723049f7c7b469e13a4ac53a9fd34c88ba8473232b0beb93e
-  data.tar.gz: 1c2b1e95f0f01ca0ef7e641338eac0ab18e59b1137980dd912cb8b7321d7311a0dfa4f7458d796d73040e73ba91768399f19f9320be2a7da4b8941026337783e
+  metadata.gz: 2a2e0c1288b03cb7457f7bb750a3d44a673059640f2d28c4be8f33be52e2fc2fe10c1c8e4e6fde14f6e478111301236271945312a3b2d3c6b171597dfad035bd
+  data.tar.gz: 86af35a5e87a1bf29b814d0843e06199c351c43605d0cfc84cd2f26728ebcfaee3511766243a9d7c19247cb1be6d9b47873af8cfdb5c1a1650956e45bb6e6d85

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

@@ -30,7 +30,7 @@ module Uc3DmpId
 
       # Find a DMP based on the contents of the incoming JSON
       # -------------------------------------------------------------------------
-      def by_json(json:, logger: nil)
+      def by_json(json:, cleanse: true, logger: nil)
         json = Helper.parse_json(json: json)&.fetch('dmp', {})
         raise FinderError, MSG_INVALID_ARGS if json.nil? || (json['PK'].nil? && json['dmp_id'].nil?)
 
@@ -44,12 +44,12 @@ module Uc3DmpId
         # return by_provenance_identifier(json: json, client: client, logger: logger) if p_key.nil?
 
         # find_by_PK
-        p_key.nil? ? nil : by_pk(p_key: p_key, s_key: json['SK'], client: client, logger: logger)
+        p_key.nil? ? nil : by_pk(p_key: p_key, s_key: json['SK'], client: client, cleanse: cleanse, logger: logger)
       end
 
       # Find the DMP by its PK and SK
       # -------------------------------------------------------------------------
-      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, logger: nil)
+      def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, cleanse: true, logger: nil)
         raise FinderError, MSG_MISSING_PK if p_key.nil?
 
         s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.to_s.strip.empty?
@@ -67,7 +67,7 @@ module Uc3DmpId
         return nil if dmp['dmp']['PK'].nil?
 
         dmp = Versioner.append_versions(p_key: dmp['dmp']['PK'], dmp: dmp, client: client, logger: logger)
-        Helper.cleanse_dmp_json(json: dmp)
+        cleanse ? Helper.cleanse_dmp_json(json: dmp) : dmp
       end
 
       # Fetch just the PK to see if a record exists
@@ -88,7 +88,7 @@ module Uc3DmpId
       # Attempt to find the DMP item by the provenance system's identifier
       # -------------------------------------------------------------------------
       # rubocop:disable Metrics/AbcSize
-      def by_provenance_identifier(json:, client: nil, logger: nil)
+      def by_provenance_identifier(json:, client: nil, cleanse: true, logger: nil)
         raise FinderError, MSG_MISSING_PROV_ID if json.nil? || json.fetch('dmp_id', {})['identifier'].nil?
 
         args = {
@@ -110,7 +110,7 @@ module Uc3DmpId
         return nil if dmp['dmp']['PK'].nil?
 
         # If we got a hit, fetch the DMP and return it.
-        by_pk(p_key: dmp['dmp']['PK'], s_key: dmp['dmp']['SK'])
+        by_pk(p_key: dmp['dmp']['PK'], s_key: dmp['dmp']['SK'], cleanse: cleanse, logger: logger)
       end
       # rubocop:enable Metrics/AbcSize
 

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

@@ -21,7 +21,7 @@ module Uc3DmpId
 
         # fetch the existing latest version of the DMP ID
         client = Uc3DmpDynamo::Client.new(logger: logger)
-        existing = Finder.by_pk(p_key: p_key, client: client, logger: logger)
+        existing = Finder.by_pk(p_key: p_key, client: client, logger: logger, cleanse: false)
         logger.debug(message: "Existing latest record", details: existing) if logger.respond_to?(:debug)
 
         errs = _updateable?(provenance: provenance, p_key: p_key, json: annotated)

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

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

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

@@ -36,11 +36,9 @@ module Uc3DmpId
 puts "Provenance: #{provenance}, PK: #{p_key}"
 puts dmp
 
-        return nil unless p_key.is_a?(String) && !p_key.strip.empty? && _versionable?(dmp: dmp)
+        return nil unless p_key.is_a?(String) && !p_key.strip.empty? && _versionable?(p_key: p_key, dmp: latest_version)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
-        latest_version = Finder.by_p_key(client: client, p_key: p_key) unless latest_version.is_a?(Hash) &&
-                                                                              !latest_version['PK'].nil?
 
         owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
@@ -86,8 +84,11 @@ puts dmp
       private
 
       # Determine whether the specified DMP metadata is versionable - returns boolean
-      def _versionable?(dmp:)
-        return false unless dmp.is_a?(Hash) && dmp['PK'].nil? && dmp['SK'].nil?
+      def _versionable?(p_key:, dmp:)
+
+puts "PK MATCH? #{dmp['PK'] == p_key}, SK IS LATEST? #{dmp['SK'] == Helper::DMP_LATEST_VERSION}, DMP ID PRESENT? #{!dmp.fetch('dmp_id', {})['identifier'].nil?}"
+
+        return false unless dmp.is_a?(Hash) && dmp['PK'] == p_key && dmp['SK'] == Helper::DMP_LATEST_VERSION
 
         # It's versionable if it has a DMP ID
         !dmp.fetch('dmp_id', {})['identifier'].nil?

metadata

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