uc3-dmp-id 0.1.70 → 0.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb63f060db6bbbf29aacb329a163adcb1c3ee80ecd9eed385894b5d3f824380
-  data.tar.gz: 9caa229b0f0e270ac9da5160af0d1b36876cf95bbc5d4b9e2dc92a8a032c0406
+  metadata.gz: b90c20a70e3d549ed563b01ac4548f727ff36333e017841fbcc33dd1687e1f9e
+  data.tar.gz: a86589814101e440390ec0c637b2a79ba8f6ee1e454cc2eeb8b51801bdbe4e5d
 SHA512:
-  metadata.gz: ba8bfca2d71f74097386240b43888e1f4fbe2d0443a881f5a264b0db475f224bfc7e96f9592f61b108d82a9570d15613a7d5b098d4495319c6fc601e40d194e5
-  data.tar.gz: e86673a1a825b4541ee868d5c7dac78d3cae186c328151c09e9ef6390bf687594ed36cd434d6f0ddd5a5b22cbd22c1627de0b5d6cbf465ca221f5c3b7b23d420
+  metadata.gz: 422bd12145eca2376172a80f8c6c66376ce4c792760d5ba4c99fabab266a7f9463831a89c0743edc76c84576c6cc0330db7c8721c765711b80f05339f4a202ba
+  data.tar.gz: 6f98e2324a6cd7023960dbe641da9d263baed02503645f1e32933feef751117a4de84c13c20056b9fac0d24d79c12e24ea6f1fbfa507db66b22312c3583f7ed8

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

@@ -16,9 +16,9 @@ module Uc3DmpId
       def update(provenance:, p_key:, json: {}, logger: nil)
         raise UpdaterError, Helper::MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
 
-        mods = Helper.parse_json(json:).fetch('dmp', {})
+        payload = Helper.parse_json(json:).fetch('dmp', {})
         p_key = Helper.append_pk_prefix(p_key:)
-        logger.debug(message: "Incoming modifications for PK #{p_key}", details: mods) if logger.respond_to?(:debug)
+        logger.debug(message: "Incoming modifications for PK #{p_key}", details: payload) if logger.respond_to?(:debug)
 
         # Fetch the latest version of the DMP ID
         client = Uc3DmpDynamo::Client.new
@@ -28,48 +28,50 @@ module Uc3DmpId
 
         # Verify that the DMP ID is updateable with the info passed in
         errs = _updateable?(provenance:, p_key:, latest_version: latest_version['dmp'],
-                            mods: mods['dmp'])
+                            mods: payload['dmp'])
         logger.error(message: errs.join(', ')) if logger.respond_to?(:error) && errs.is_a?(Array) && errs.any?
         raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
         # Don't continue if nothing has changed!
-        raise UpdaterError, Helper::MSG_NO_CHANGE if Helper.eql?(dmp_a: latest_version, dmp_b: mods)
+        raise UpdaterError, Helper::MSG_NO_CHANGE if Helper.eql?(dmp_a: latest_version, dmp_b: payload)
 
         # Version the DMP ID record (if applicable).
         owner = latest_version['dmphub_provenance_id']
         updater = provenance['PK']
         version = Versioner.generate_version(client:, latest_version:, owner:,
                                              updater:, logger:)
+        logger&.debug(message: 'New Version', details: version)
         raise UpdaterError, Helper::MSG_DMP_UNABLE_TO_VERSION if version.nil?
         # Bail if the system trying to make the update is not the creator of the DMP ID
         raise UpdaterError, Helper::MSG_DMP_FORBIDDEN if owner != updater
 
         # Handle any changes to the dmphub_modifications section
-        version = _process_harvester_mods(client:, p_key:, json: mods, logger:)
+        payload = _process_harvester_mods(client:, p_key:, json: payload, logger:)
+        logger&.debug(message: 'Mods after process_harvester_mods', details: payload)
 
         # Remove the version info because we don't want to save it on the record
-        version.delete('dmphub_versions')
+        payload.delete('dmphub_versions')
 
         # Splice the assertions
-        version = _process_modifications(owner:, updater:, version:, mods:, logger:)
-        logger&.debug(message: 'Mods after process_modifications', details: version)
+        payload = _process_modifications(owner:, updater:, version:, mods: payload, logger:)
+        logger&.debug(message: 'Mods after process_modifications', details: payload)
 
         # Set the :modified timestamps
         now = Time.now.utc
-        version['modified'] = now.iso8601
-        version['dmphub_modification_day'] = now.strftime('%Y-%m-%d')
+        payload['modified'] = now.iso8601
+        payload['dmphub_modification_day'] = now.strftime('%Y-%m-%d')
 
         # Save the changes
-        resp = client.put_item(json: version, logger:)
+        resp = client.put_item(json: payload, logger:)
         raise UpdaterError, Helper::MSG_DMP_UNABLE_TO_VERSION if resp.nil?
 
         # Send the updates to EZID
-        _post_process(provenance:, json: version, logger:)
+        _post_process(provenance:, json: payload, logger:)
 
         # Return the new version record
         logger.info(message: "Updated DMP ID: #{p_key}") if logger.respond_to?(:debug)
 
         # Append the :dmphub_versions Array
-        json = JSON.parse({ dmp: version }.to_json)
+        json = JSON.parse({ dmp: payload }.to_json)
         json = Versioner.append_versions(p_key:, dmp: json, client:, logger:)
         Helper.cleanse_dmp_json(json:)
       end
@@ -140,11 +142,12 @@ module Uc3DmpId
         logger.debug(message: 'Modifications before merge.', details: mods) if logger.respond_to?(:debug)
         keys_to_retain = version.keys.select do |key|
           (key.start_with?('dmphub_') && !%w[dmphub_modifications dmphub_versions].include?(key)) ||
-            key.start_with?('PK') || key.start_with?('SK') || key.start_with?('dmproadmap_related_identifiers')
+            key.start_with?('PK') || key.start_with?('dmproadmap_related_identifiers')
         end
         keys_to_retain.each do |key|
           mods[key] = version[key]
         end
+        mods['SK'] = Helper::DMP_LATEST_VERSION
         logger.debug(message: 'Modifications after merge.', details: mods) if logger.respond_to?(:debug)
         mods
       end
@@ -207,21 +210,25 @@ module Uc3DmpId
         logger&.debug(message: 'Original HARVESTER_MODS record', details: resp)
         # The `dmphub_modifications` array will ONLY ever have things the harvester mods know about
         # so just find them and update the status accordingly
-        mods = resp.dup
+        original = resp.dup
         json['dmphub_modifications'].each do |entry|
           next if entry.fetch('dmproadmap_related_identifiers', []).empty?
 
           entry['dmproadmap_related_identifiers'].each do |related|
-            related_id = mods['related_works'][related.identifier] if related.respond_to?(:identifier)
-            related_id = mods['related_works'][related['identifier']] if related_id.nil?
-            next if related_id.nil?
-
-            mods['related_works'][related_id]['status'] = related['status']
+            related_id = related.respond_to?(:identifier) ? related.identifier : related['identifier']
+            related_domain = related.respond_to?(:domain) ? related.domain : related['domain']
+            key = "#{related_domain.end_with?('/') ? related_domain : "#{related_domain}/"}#{related_id}"
+            key_found = original['related_works'].has_key?(key)
+            logger&.debug(message: "No matching HARVEST_MOD found for #{key}") unless key_found
+            next unless key_found
+
+            logger&.debug(message: "Updating status for #{key} from #{original['related_works'][key]['status']} to #{related['status']}")
+            original['related_works'][key]['status'] = related['status']
           end
         end
 
-        logger&.debug(message: 'Updating HARVESTER_MODS with:', details: mods)
-        client.put_item(json: mods, logger:)
+        logger&.debug(message: 'Updating HARVESTER_MODS with:', details: original)
+        client.put_item(json: original, logger:)
         json.delete('dmphub_modifications')
         logger&.debug(message: 'After deleting dmphub_modifications:', details: json)
         json

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

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

metadata

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