uc3-dmp-id 0.0.107 → 0.0.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da70a2b2604989dfafbd5cde63a1b83bebbb3b28d32d1819af2cdc2753e1c11
-  data.tar.gz: 9f5f266f053738ecfdae324326ea3ad2df44e7a47dbf2e8ca6c48764caa3d979
+  metadata.gz: 2904670927e7a3f94ab9396ea89145c6526a9df02a6ac75beb5231920c4a16ff
+  data.tar.gz: 05ff04ea8ec68d06b8f0854269d511422019ced71f1d2347aef4232a0175c564
 SHA512:
-  metadata.gz: ef4ecc2584dc4e09730dd605aa979bbc0b9b9819886f3f57d885d8da8e6fea4da8eec60b523610d5c9c52d54ee2178a7100ade55afdad656529d6640ea1c5357
-  data.tar.gz: 7412edf48dc0997df0d80251912a9112545f593f7eaf4a30eda41c2c5d8b9fb666073f64eabcc429454b00d1acd8b10d9d1068aff399b648a1023b66d47e69c6
+  metadata.gz: e16cb5b1ad93195b0244645faa04144c6f88aec037340529d5190b7b7cff1b5308e5273cec5a654ecad0b4624468464500ca9e5ce08034261a793d44ba3c056f
+  data.tar.gz: 259be986f9f8e4d4d91f7d39558e6dda44290ed3ea4dbf727bd8c7e92f74da8419e962cf9f7d511c6ae4dd620b18b29acdb2bd409a8430c98bdfae34bf55e361

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

@@ -32,26 +32,16 @@ module Uc3DmpId
         raise UpdaterError, MSG_NO_CHANGE if Helper.eql?(dmp_a: latest_version, dmp_b: mods)
 
         # Version the DMP ID record (if applicable).
-
-puts "DMPHub PROV: #{latest_version['dmphub_provenance_id']}, DMP BURIED: #{latest_version.fetch('dmp', {})['dmphub_provenance_id']}"
-
         owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
         version = Versioner.generate_version(client: client, latest_version: latest_version, owner: owner, updater: updater,
                                              logger: logger)
         raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if version.nil?
 
-puts "OWNER AFTER VERSION: #{owner}"
-puts version
-
-
         # Splice the assertions
         version = _process_modifications(owner: owner, updater: updater, version: version, mods: mods, note: note,
                                          logger: logger)
 
-puts "AFTER PROCESING MODS:"
-puts version
-
         # Save the changes
         resp = client.put_item(json: version, logger: logger)
         raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
@@ -73,11 +63,10 @@ puts version
 
         # fetch the existing latest version of the DMP ID
         client = Uc3DmpDynamo::Client.new(logger: logger)
-        dmp = Finder.by_pk(p_key: p_key, client: client, logger: logger)
+        dmp = Finder.by_pk(p_key: p_key, client: client, logger: logger, cleanse: false)
         logger.info(message: "Existing latest record", details: dmp) if logger.respond_to?(:debug)
-
-        errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp['dmp'])
-        raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
+        raise UpdaterError, MSG_DMP_FORBIDDEN unless provenance.is_a?(Hash) && !provenance['PK'].nil? &&
+                                                     provenance['Pk'] == dmp['dmphub_provenance_id']
 
         # Add the download URl for the PDF as a related identifier on the DMP ID record
         annotated = Helper.annotate_dmp_json(provenance: provenance, p_key: p_key, json: dmp['dmp'])
@@ -117,7 +106,6 @@ puts version
         updated = Asserter.splice(latest_version: version, modified_version: mods, logger: logger) if owner == updater
 
         # Attach the incoming changes as an assertion to the DMP ID since the updater is NOT the owner
-        updater = provenance['PK']
         updated = Asserter.add(updater: updater, dmp: version, mods: mods, note: note, logger: logger) if owner != updater
 
         merge_versions(latest_version: version, mods: updated, logger: logger)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.107
+  version: 0.0.109
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json