uc3-dmp-id 0.0.104 → 0.0.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f281a066200306c56a78470094fe5924fab333221e1bcdd4dcaade896d0e02ff
-  data.tar.gz: fa4b3f82159d32df245267596f3dd9d559f82c4faf07175a712448e2b2d7dd6c
+  metadata.gz: 23097d67b2f230b8c3a194cc3eed7c31f7f90056b7a8e0fae5c2d72af09a9927
+  data.tar.gz: e517ebc36f9ecddc28723d0334626ff348a95e9f91b050fbc938b628e04aae64
 SHA512:
-  metadata.gz: a35bccc8f9a1b3a4bd475ba63151c082d5a263594454f0670e5b90800bc525d381e5191054102924c4220303648904d5c11562313360b4638def9b3aea98234e
-  data.tar.gz: ebbbef1978d20fad47c45bb75f1e242e4d583fc8f3107b7370a187679ce77d8adf2679178399ab85339ba1ec2ca6e7026345dd3ebfae0534343feec270ce9b9f
+  metadata.gz: 619e35ef6240834357d62e57dcab4c70359085fff7d73d31f0505361c836c38749b35fc3b7d27967a7c7415dd49cb6de61df6b8076d714d0d329160badb7f751
+  data.tar.gz: 97d30d99e8ff0e258507f6830b10bede00c88538d3b36f3c8a1fd63711d14f0e1a32730a1fb3a196dfe1c4c99555db8eec2a8cc2b18017e617e242cb38bf0881

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

@@ -49,14 +49,14 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
         logger.debug(message: "Incoming modifications", details: incoming_assertions) if logger.respond_to?(:debug)
 
         # Keep any assetions that were made after the dmphub_updated_at on the incoming changes
-        latest_version['dmphub_assertions'] = existing_assertions.select do |entry|
+        modified_version['dmphub_assertions'] = existing_assertions.select do |entry|
           !entry['timestamp'].nil? && Time.parse(entry['timestamp']) > Time.parse(modified_version['dmphub_updated_at'])
         end
-        return latest_version unless incoming_assertions.any?
+        return modified_version unless incoming_assertions.any?
 
         # Add any of the assertions still on the incoming record back to the latest record
-        incoming_assertions.each { |entry| latest_version['dmphub_assertions'] << entry }
-        latest_version
+        incoming_assertions.each { |entry| modified_version['dmphub_assertions'] << entry }
+        modified_version
       end
 
       private

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

@@ -49,6 +49,9 @@ puts version
         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?
@@ -107,21 +110,32 @@ puts version
       end
 
       def _process_modifications(owner:, updater:, version:, mods:, note: nil, logger: nil)
-
-puts "OWNER: #{owner}, UPDATER #{updater}, Version is Hash? #{version.is_a?(Hash)}, Mods is Hash? #{mods.is_a?(Hash)}"
-
-puts "Returning version? #{!mods.is_a?(Hash) || updater.nil?}"
-puts "Returning mods? #{!version.is_a?(Hash) || owner.nil?}"
-
         return version unless mods.is_a?(Hash) && !updater.nil?
         return mods unless version.is_a?(Hash) && !owner.nil?
 
-puts "Asserting!"
-
         # Splice together any assertions that may have been made while the user was editing the DMP ID
-        Asserter.splice(latest_version: version, modified_version: mods, logger: logger) if owner == updater
+        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
-        Asserter.add(updater: provenance['PK'], dmp: version, mods: mods, note: note, logger: logger) if owner != updater
+        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)
+      end
+
+      # We are replacing the latest version with the modifcations but want to retain the PK, SK and any dmphub_ prefixed
+      # entries in the metadata so that we do not lose creation timestamps, provenance ids, etc.
+      def merge_versions(latest_version:, mods:, logger: nil)
+        logger.debug(message: 'Modifications before merge.', details: mods)
+        keys_to_retain = latest_version.keys.select do |key|
+          (key.start_with?('dmphub_') && !%w[dmphub_assertions].include?(key)) ||
+            key.start_with?('PK') || key.start_with?('SK')
+        end
+        keys_to_retain.each do |key|
+          mods[key] = latest_version[key]
+        end
+        logger.debug(message: 'Modifications after merge.', details mods)
+        mods
       end
 
       # Once the DMP has been updated, we need to update it's DOI metadata

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

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

metadata

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