uc3-dmp-id 0.1.41 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c0311ee13737f806f60f0a21392195a5a61cb8498b0e9b30549ea1f44ce3b65
-  data.tar.gz: 95c4fbeda9c5b4a91a86477d0eebec6c4a1ba6875d45011cabef75beffa62edd
+  metadata.gz: 1d34166c684cf6fa12a8818370354993d080d32954def1a1ce3a8090f06a8139
+  data.tar.gz: 77cade4c0abdd3991f0857fcb8610ed5679d9d2c36df2449b517ee0d23b31458
 SHA512:
-  metadata.gz: a300583a83d97b57c6344ecc7a623ebb4ea3b758583b0a6624ec3decf2da699d2f13145ad8d6d45e4dd707b55f4f131e6b87e7ba6fa065b8035480b28abc821f
-  data.tar.gz: 7a152569e26ff816a4605b7f1787d33114005aa8a4183fc7a29d85788587136683621766886832ef02d5040d6a69ce6dd5f6434b8afb57cbd594430d409158ca
+  metadata.gz: cab91decdeb2cf5d3a93144c368f10791dd7abeafff8a1953e56e1e98a0116080eb946b8a9d1e733a53c2601cf17815f4c1809bef6ae642b23b3130852fcf968
+  data.tar.gz: 04520b13350dd35c6ff021429d2ff483619fab506f5b724e0aea11c937630453192b549fd070f115a7a8e6e5e307a99d114d5014dfdd23edf962a2478363b3b9

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

@@ -82,7 +82,11 @@ module Uc3DmpId
 
         # fetch the existing latest version of the DMP ID
         client = Uc3DmpDynamo::Client.new(logger:)
-        dmp = Finder.by_pk(p_key:, client:, logger:, cleanse: false)
+        # dmp = Finder.by_pk(p_key:, client:, logger:, cleanse: false)
+        resp = client.get_item(key: { PK: p_key, SK: Helper::DMP_LATEST_VERSION }, logger:)
+        raise UpdaterError, Helper::MSG_DMP_INVALID_DMP_ID unless resp.is_a?(Hash)
+
+        dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
         logger.info(message: 'Existing latest record', details: dmp) if logger.respond_to?(:debug)
         raise UpdaterError, Helper::MSG_DMP_FORBIDDEN unless provenance.is_a?(Hash) && !provenance['PK'].nil? &&
                                                              provenance['PK'] == dmp['dmp']['dmphub_provenance_id']
@@ -90,17 +94,16 @@ module Uc3DmpId
         logger&.debug(message: "DMP Prior to narrative attachment", details: dmp)
 
         # Add the download URl for the PDF as a related identifier on the DMP ID record
-        annotated = Helper.annotate_dmp_json(provenance:, p_key:, json: dmp['dmp'])
-        annotated['dmproadmap_related_identifiers'] = [] if annotated['dmproadmap_related_identifiers'].nil?
-        annotated['dmproadmap_related_identifiers'] << JSON.parse({
+        dmp['dmproadmap_related_identifiers'] = [] if dmp['dmproadmap_related_identifiers'].nil?
+        dmp['dmproadmap_related_identifiers'] << JSON.parse({
           descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url
         }.to_json)
 
         # Save the changes without creating a new version!
-        resp = client.put_item(json: annotated, logger:)
+        resp = client.put_item(json: dmp, logger:)
         raise UpdaterError, Helper::MSG_DMP_UNABLE_TO_VERSION if resp.nil?
 
-        logger&.debug(message: "Added DMP ID narrative for PK: #{p_key}, Narrative: #{url}", details: annotated)
+        logger&.debug(message: "Added DMP ID narrative for PK: #{p_key}, Narrative: #{url}", details: dmp)
         true
       end
       # rubocop:enable Metrics/AbcSize

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

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

metadata

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