uc3-dmp-id 0.0.108 → 0.0.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac1d8aa8c945ab970a842b101c6abf86fb0c758877e138c3b8d8078e1e34b0f
-  data.tar.gz: 6a3bcb2ba5577ce20ec437344fbcf4ec85c03dccc3309a2e9e1e0de505e8e5da
+  metadata.gz: 6b951a79fba1e0ca52529329628da1616600cc7a6f37c25d357c35652caf7ba7
+  data.tar.gz: 362d3e8d02de8e407553ff2e71a680b4ec9eaf7e272998a4e6dc1de3923fd81f
 SHA512:
-  metadata.gz: 1c60ca807292bcc01defd4a9f46b10e3719e2000f942b536eb3609a2c76f17bd6ea4149e1346f7a5067941a203fcb9355bb9506511de5713c73bb0521a5f0c1a
-  data.tar.gz: f5c3eae81c888a1389115898ec6cc654902545c51883cc66dca5f514c023024b1045c1d365b6335a509b4373c3e11b8844f423b17968271817ae8f96ca37cb76
+  metadata.gz: 0b0c3ca513b975699cdf5c42943d98c38d43f5ac374d320dececcad9b9a9eb44b8549361f7ce13fbd3be72fe10fcc0a048bfec0d08340f9bffa2cb9691ab0094
+  data.tar.gz: c8c50c7345444d2209f75cc26f3531e4ca28b1bc73bb3679dc09a6f6b6f5d3fa2b895901dd75a9f4338e6deefcfd50dd175bea75ad06c2ad9a409bec9b3610c1

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

@@ -129,7 +129,7 @@ module Uc3DmpId
                 "http://orcid.org/#{owner_id.to_s.downcase}",
                 "https://orcid.org/#{owner_id.to_s.downcase}"
               ],
-              comparison_operator: 'EQ'
+              comparison_operator: 'IN'
             }
           },
           filter_expression: 'SK = :version',
@@ -153,7 +153,7 @@ module Uc3DmpId
                 "http://ror.org/#{owner_org.to_s.downcase}",
                 "https://ror.org/#{owner_org.to_s.downcase}"
               ],
-              comparison_operator: 'EQ'
+              comparison_operator: 'IN'
             }
           },
           filter_expression: 'SK = :version',
@@ -174,7 +174,7 @@ module Uc3DmpId
           key_conditions: {
             dmphub_modification_day: {
               attribute_value_list: [day.to_s],
-              comparison_operator: 'EQ'
+              comparison_operator: 'IN'
             }
           },
           filter_expression: 'SK = :version',

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'])

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.108
+  version: 0.0.110
 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