uc3-dmp-id 0.0.62 → 0.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d86231b0d9bbba113c84fca3f8496f7a1d09eb07386b13f3a8082d1b79d9cd5
-  data.tar.gz: 4c5bdfeda6ad713e7a77e6bb6cc27f5942dc170fe477920a40f42da43ff00f40
+  metadata.gz: 9a0c6efaee7727ad373bdccdc9184e12d1abefafe3834768c210d949d854c669
+  data.tar.gz: 0c771250b7459256822a87dc99bdbc720ebca8cc2f4d5a5c53ccfcf5a8a0d0aa
 SHA512:
-  metadata.gz: 55a11fcf0cae95da912fde23d91b10a4cb0b0aed0fe607bab4a6db267e59030faa1c7d53b40bb9780888646bf530c296c9d9532a5b2ed77ab892af4606579ba2
-  data.tar.gz: b305efdd75d24efc03ed9a792b7c8b04c3c530618071440c651a65f46f1a60b68d73e01185acbb65f928f4d34dfe35d733ee8ee39ef5af3afc41a23c7ca55b65
+  metadata.gz: 98025dcd7ccdd69b284b910d8391a715c2b2b72799398cf432bf1688efc25b22caf7f25e5b5ca0eb2d528b7256703304f287fa15b92cc9df6ce96d4aa4e7c738
+  data.tar.gz: bdc3d64ec36a853aca5ec44d32a415b65dc868b83c3bd48ce4054aae2a546a8005b3f25400d6bd759ef8fb6085e1f0bdfea16c1b4b6e178e1861e443a9a1cb3e

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

@@ -47,7 +47,7 @@ module Uc3DmpId
         raise CreatorError, Uc3DmpId::MSG_DMP_NO_DMP_ID if resp.nil?
 
         _post_process(json: annotated, debug: debug)
-        annotated
+        Helper.cleanse_dmp_json(json: JSON.parse({ dmp: annotated }.to_json))
       end
 
       private

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

@@ -155,7 +155,7 @@ module Uc3DmpId
         annotated['SK'] = DMP_LATEST_VERSION
 
         # Ensure that the :dmp_id matches the :PK
-        annotated['dmp_id'] = pk_to_dmp_id(p_key: annotated['PK'])
+        annotated['dmp_id'] = pk_to_dmp_id(p_key: remove_pk_prefix(p_key: annotated['PK']))
 
         # Update the modification timestamps
         annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
@@ -182,6 +182,9 @@ module Uc3DmpId
       def cleanse_dmp_json(json:)
         return json unless json.is_a?(Hash) || json.is_a?(Array)
 
+puts "Cleansing DMP JSON:"
+puts json
+
         # If it's an array clean each of the objects individually
         return json.map { |obj| cleanse_dmp_json(json: obj) }.compact if json.is_a?(Array)
 

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

@@ -10,96 +10,93 @@ module Uc3DmpId
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       # -------------------------------------------------------------------------
       def update(provenance:, p_key:, json: {})
-      raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
-
-      dmp = Helper.parse_json(json: json)
-      errs = _updateable?(provenance: provenance, p_key: p_key, dmp: dmp)
-      raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
-
-      # Add the DMPHub specific attributes
-      annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
-
-      # fetch the existing latest version of the DMP ID
-      client = Uc3DmpDynamo::Client.new(debug: debug)
-      existing = Finder.by_pk(p_key: p_key, client: client, debug: debug)
-      # Don't continue if nothing has changed!
-      raise UpdaterError, MSG_NO_CHANGE if Helper.eql?(dmp_a: existing, dmp_b: annotated)
-
-      # Generate a new version of the DMP. This involves versioning the current latest version
-      new_version = versioner.new_version(p_key: p_key, dmp: json)
-      raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if new_version.nil?
-
-      # Save the changes as the new latest version
-      resp = client.put_item(json: new_version, debug: debug)
-      raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
-
-      # Send the updates to EZID, notify the provenance and download the PDF if applicable
-      _post_process(json: dmp, debug: debug)
-      resp
-    end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-    def attach_narrative(provenance:, p_key:, url:, debug: false)
-      raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
-
-      # fetch the existing latest version of the DMP ID
-      client = Uc3DmpDynamo::Client.new(debug: debug)
-      dmp = Finder.by_pk(p_key: p_key, client: client, debug: debug)
-      owner_org = Helper.extract_owner_org(json: dmp)
-      # Don't continue if DMP ID could not be found or the contact has no identifier (should be impossible)
-      raise UpdaterError, MSG_DMP_NOT_FOUND if dmp.nil? || owner_org.nil?
-
-      errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp['dmp'])
-      raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
-
-      # Add the DMPHub specific attributes and then add the download URl for the PDF
-      annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: dmp['dmp'])
-      annotated['dmproadmap_related_identifiers'] = [] if annotated['dmproadmap_related_identifiers'].nil?
-      annotated['dmproadmap_related_identifiers'] << {
-        descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url
-      }
-
-puts "Attached:"
-puts annotated
-
-      # Save the changes without creating a new version!
-      resp = client.put_item(json: annotated, debug: debug)
-      raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
-
-      true
-    end
-
-    private
-
-    # Check if the DMP ID is updateable by the provenance
-    def _updateable?(provenance:, p_key:, json:)
-      # Validate the incoming JSON first
-      errs = Validator.validate(mode: 'author', json: json)
-      return errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
-
-      # Fail if the provenance is not defined
-      return [MSG_DMP_FORBIDDEN] unless provenance.is_a?(Hash) && !provenance['PK'].nil?
-
-      # Verify that the JSON is for the same DMP in the PK
-      dmp_id = json.fetch('dmp_id', {})
-      return [MSG_DMP_FORBIDDEN] unless Helper.dmp_id_to_pk(json: dmp_id) == p_key
-      # Make sure they're not trying to update a historical copy of the DMP
-      return [MSG_DMP_NO_HISTORICALS] if json['SK'] != Helper::DMP_LATEST_VERSION
-    end
-
-    # Once the DMP has been updated, we need to register it's DMP ID and download any PDF if applicable
-    # -------------------------------------------------------------------------
-    def _post_process(json:, debug: false)
-      return false unless json.is_a?(Hash)
-
-      # Indicate whether or not the updater is the provenance system
-      json['dmphub_updater_is_provenance'] = @provenance['PK'] == json['dmphub_provenance_id']
-      # Publish the change to the EventBridge
-      publisher = Uc3DmpEventBridge::Publisher.new
-      publisher.publish(source: 'DmpUpdater', dmp: json, debug: debug)
-      true
-    end
+        raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
+
+        dmp = Helper.parse_json(json: json)
+        errs = _updateable?(provenance: provenance, p_key: p_key, dmp: dmp)
+        raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
+
+        # Add the DMPHub specific attributes
+        annotated = Helper.annotate_dmp(provenance: provenance, json: dmp['dmp'], p_key: p_key)
+
+        # fetch the existing latest version of the DMP ID
+        client = Uc3DmpDynamo::Client.new(debug: debug)
+        existing = Finder.by_pk(p_key: p_key, client: client, debug: debug)
+        # Don't continue if nothing has changed!
+        raise UpdaterError, MSG_NO_CHANGE if Helper.eql?(dmp_a: existing, dmp_b: annotated)
+
+        # Generate a new version of the DMP. This involves versioning the current latest version
+        new_version = versioner.new_version(p_key: p_key, dmp: json)
+        raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if new_version.nil?
+
+        # Save the changes as the new latest version
+        resp = client.put_item(json: new_version, debug: debug)
+        raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
+
+        # Send the updates to EZID, notify the provenance and download the PDF if applicable
+        _post_process(json: dmp, debug: debug)
+        resp
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      def attach_narrative(provenance:, p_key:, url:, debug: false)
+        raise UpdaterError, MSG_DMP_INVALID_DMP_ID unless p_key.is_a?(String) && !p_key.strip.empty?
+
+        # fetch the existing latest version of the DMP ID
+        client = Uc3DmpDynamo::Client.new(debug: debug)
+        dmp = Finder.by_pk(p_key: p_key, client: client, debug: debug)
+        owner_org = Helper.extract_owner_org(json: dmp)
+        # Don't continue if DMP ID could not be found or the contact has no identifier (should be impossible)
+        raise UpdaterError, MSG_DMP_NOT_FOUND if dmp.nil? || owner_org.nil?
+
+        errs = _updateable?(provenance: provenance, p_key: p_key, json: dmp['dmp'])
+        raise UpdaterError, errs if errs.is_a?(Array) && errs.any?
+
+        # Add the DMPHub specific attributes and then add the download URl for the PDF
+        annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: dmp['dmp'])
+        annotated['dmproadmap_related_identifiers'] = [] if annotated['dmproadmap_related_identifiers'].nil?
+        annotated['dmproadmap_related_identifiers'] << {
+          descriptor: 'is_metadata_for', work_type: 'output_management_plan', type: 'url', identifier: url
+        }
+
+        # Save the changes without creating a new version!
+        resp = client.put_item(json: annotated, debug: debug)
+        raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?
+
+        true
+      end
+
+      private
+
+      # Check if the DMP ID is updateable by the provenance
+      def _updateable?(provenance:, p_key:, json:)
+        # Validate the incoming JSON first
+        errs = Validator.validate(mode: 'author', json: json)
+        return errs.join(', ') if errs.is_a?(Array) && errs.any? && errs.first != Validator::MSG_VALID_JSON
+
+        # Fail if the provenance is not defined
+        return [MSG_DMP_FORBIDDEN] unless provenance.is_a?(Hash) && !provenance['PK'].nil?
+
+        # Verify that the JSON is for the same DMP in the PK
+        dmp_id = json.fetch('dmp_id', {})
+        return [MSG_DMP_FORBIDDEN] unless Helper.dmp_id_to_pk(json: dmp_id) == p_key
+        # Make sure they're not trying to update a historical copy of the DMP
+        return [MSG_DMP_NO_HISTORICALS] if json['SK'] != Helper::DMP_LATEST_VERSION
+      end
+
+      # Once the DMP has been updated, we need to register it's DMP ID and download any PDF if applicable
+      # -------------------------------------------------------------------------
+      def _post_process(json:, debug: false)
+        return false unless json.is_a?(Hash)
+
+        # Indicate whether or not the updater is the provenance system
+        json['dmphub_updater_is_provenance'] = @provenance['PK'] == json['dmphub_provenance_id']
+        # Publish the change to the EventBridge
+        publisher = Uc3DmpEventBridge::Publisher.new
+        publisher.publish(source: 'DmpUpdater', dmp: json, debug: debug)
+        true
+      end
     end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.62
+  version: 0.0.64
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json