uc3-dmp-id 0.1.75 → 0.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18cc7a2a74f91898c76cb8686c511023bc31dd2147d92bd172ae7a00a2dd72b3
-  data.tar.gz: ab9b8e2009e384fc1b20a99ea92dc92ddabc1779c9c6d02ed369d171724766cb
+  metadata.gz: dcc7bf54d3beeb3610d64490a6037022fbef6569ae0ee67188eeafea34a67ae7
+  data.tar.gz: 722e4bd441ed71e9265d6bde56663cccc6b4ccbf49178ac24d1b46072aa97295
 SHA512:
-  metadata.gz: d989d0ea6f7e7cb0486f9b7982a40f4085dc4056576c7f4bb0225b5d37f1fb9175fc57f3628a3d1e1cd2cf342305fb79791681798657c58f0be6bccc61bee5aa
-  data.tar.gz: 71379ba74f63add7f9443b0a85b30cb64664e5602499cabd91f27512a5b0567bb88f83e9890efd42e8b6914267457aabfb177ee616eb3925939991c147e1fe4d
+  metadata.gz: 293ab0fd326ff54633662b53aae5a82a24b456593134196c0f15e167a3acaf57706ee2c432e4ba3bb1ef382f80540f3df9cc7074312606d58c6ec3d1a9c54da9
+  data.tar.gz: a0f9ee659c34501642287dfc4cbbd77b4e184d09272cac143df8d2fd60fab51a05ab5c24d50647c5650b9b8dcd55162b4c4394e65f54748e6ff0ca2e0f4a429a

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

@@ -45,35 +45,32 @@ module Uc3DmpId
         raise UpdaterError, Helper::MSG_DMP_FORBIDDEN if owner != updater
 
         # Handle any changes to the dmphub_modifications section
-        payload = _process_harvester_mods(client:, p_key:, json: payload, logger:)
-        logger&.debug(message: 'Mods after process_harvester_mods', details: payload)
+        version = _process_harvester_mods(client:, p_key:, json: payload, version:, logger:)
+        logger&.debug(message: 'Version after process_harvester_mods', details: version)
 
-        # Remove the version info because we don't want to save it on the record
-        payload.delete('dmphub_versions')
-
-        # Splice the assertions
-        payload = _process_modifications(owner:, updater:, version:, mods: payload, logger:)
-        logger&.debug(message: 'Mods after process_modifications', details: payload)
+        # Remove the version info any any lingering modification blocks
+        version.delete('dmphub_versions')
+        version.delete('dmphub_modifications')
 
         # Set the :modified timestamps
         now = Time.now.utc
-        payload['modified'] = now.iso8601
-        payload['dmphub_modification_day'] = now.strftime('%Y-%m-%d')
+        version['modified'] = now.iso8601
+        version['dmphub_modification_day'] = now.strftime('%Y-%m-%d')
 
         # Save the changes
-        resp = client.put_item(json: payload, logger:)
+        resp = client.put_item(json: version, logger:)
         raise UpdaterError, Helper::MSG_DMP_UNABLE_TO_VERSION if resp.nil?
 
         # Send the updates to EZID
-        _post_process(provenance:, json: payload, logger:)
+        _post_process(provenance:, json: version, 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: payload }.to_json)
-        json = Versioner.append_versions(p_key:, dmp: json, client:, logger:)
-        Helper.cleanse_dmp_json(json:)
+        out = JSON.parse({ dmp: version }.to_json)
+        out = Versioner.append_versions(p_key:, dmp: out, client:, logger:)
+        Helper.cleanse_dmp_json(json: out)
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -134,25 +131,6 @@ module Uc3DmpId
       end
       # rubocop:enable Metrics/AbcSize
 
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      def _process_modifications(owner:, updater:, version:, mods:, logger: nil)
-        return version unless mods.is_a?(Hash) && !updater.nil?
-        return mods unless version.is_a?(Hash) && !owner.nil?
-
-        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)
-        end
-        keys_to_retain.each { |key| mods[key] = version[key] }
-
-        mods['PK'] = version['PK']
-        mods['SK'] = Helper::DMP_LATEST_VERSION
-        logger.debug(message: 'Modifications after merge.', details: mods) if logger.respond_to?(:debug)
-        mods
-      end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
       # Once the DMP has been updated, we need to update it's DOI metadata
       # -------------------------------------------------------------------------
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -196,7 +174,7 @@ module Uc3DmpId
       # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
       # Fetch any Harvester modifications to the JSON
-      def _process_harvester_mods(client:, p_key:, json:, logger: nil)
+      def _process_harvester_mods(client:, p_key:, json:, version:, logger: nil)
         logger&.debug(message: 'Incoming modifications', details: json)
         return json if json.fetch('dmphub_modifications', []).empty?
 
@@ -229,31 +207,29 @@ module Uc3DmpId
             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|
+            existing = version['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'] << {
+              version['dmproadmap_related_identifiers'] << {
                 identifier: key,
                 work_type: related['work_type'],
                 type: related['type'],
                 descriptor: related['descriptor'],
                 citation: related['citation']
-              }.to_json
-            elsif related['status'] != 'approved' && existing.any?
+              }
+            elsif related['status'] == 'rejected' && existing.any?
               # otherwise remove it
-              json['dmproadmap_related_identifiers'] = json['dmproadmap_related_identifiers'].reject { |ri| ri == existing.first }
+              version['dmproadmap_related_identifiers'] = version['dmproadmap_related_identifiers'].reject { |ri| ri == existing.first }
             end
           end
         end
 
         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
+        logger&.debug(message: 'Returning updated VERSION:', details: version)
+        version
       end
     end
   end

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

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

metadata

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