uc3-dmp-id 0.1.71 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d836115caac7a07306686448df2e596b9d77f54368e4fb5f1e1f921e8c7ad6
-  data.tar.gz: afd13d10029262be80f08cc86516292567162bbd87679fe467b0dd23c1b5d72a
+  metadata.gz: 30470f9547ebdbc1a5e8928be0fad068d5c3f1b485d78a4b12fc76eae53cfe67
+  data.tar.gz: 19a4aed6a4f3c3cd8ac29b2b8a719b4a0829d22c0b4a1cf1320640ad5868bbb7
 SHA512:
-  metadata.gz: aef2a4c77b3ee99d13f4aac02f544b978e5f7c84495e7fedcf0588f0ffa8efe495be8dc05e984487873620b292da3f9f1bf3e33a6119bbdce26c845df3161ac0
-  data.tar.gz: 87b47716904176310c6add2c3c7d376077ec462edfa6063b1f7f295b557c78ad4852e6bb3174a68c053b088ee1f8eefe2d43ea80f8d62ee10521fb0c83086a9c
+  metadata.gz: 3e7cee4b2f06b160c1a350a6d47aba1fcd0402800e6ed8a9a884dc1a6a8b6cedb7d8dacc3186c6cf51ad7e39eeff9d80e85f161c7e0662dd159457a94257d33c
+  data.tar.gz: 5c6d819af9a1be470da73fa98df34412a44f5f203260a5287d5c5131bc4e25478836047e5c421f19d736717495b980d88dacf13241d2e06824ae36bb9cc913fe

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
@@ -208,19 +211,41 @@ module Uc3DmpId
         # The `dmphub_modifications` array will ONLY ever have things the harvester mods know about
         # so just find them and update the status accordingly
         original = resp.dup
+        json['dmproadmap_related_identifiers'] = [] if json['dmproadmap_related_identifiers'].nil?
+
         json['dmphub_modifications'].each do |entry|
           next if entry.fetch('dmproadmap_related_identifiers', []).empty?
 
           entry['dmproadmap_related_identifiers'].each do |related|
+            # Detrmine if the HARVESTER_MODS record even knows about the mod
             related_id = related.respond_to?(:identifier) ? related.identifier : related['identifier']
-            related_domain = related.respond_to?(:identifier) ? related.domain : related['domain']
+            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
 
+            # Update the status in the HARVESTER_MODS record
             logger&.debug(message: "Updating status for #{key} from #{original['related_works'][key]['status']} to #{related['status']}")
             original['related_works'][key]['status'] = related['status']
+
+            existing = json['dmproadmap_related_identifiers'].select do |ri|
+              ri['identifier'] == key
+            end
+
+            # Add it if it was approved and doesn't exist in dmproadmap_related_identifiers
+            if related['status'] == 'approved' && existing.empty?
+              json['dmproadmap_related_identifiers'] << {
+                identifier: key,
+                work_type: related['work_type'],
+                type: related['type'],
+                descriptor: related['descriptor'],
+                citation: related['citation']
+              }.to_json
+            elsif exists
+              # otherwise remove it
+              json['dmproadmap_related_identifiers'] = json['dmproadmap_related_identifiers'].reject { |ri| ri == existing.first }
+            end
           end
         end
 

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

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

metadata

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