uc3-dmp-id 0.0.63 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83d0a009fdbffc97f8725896fb33492c6444ac2f12d798a5b221f879f4d0d32
-  data.tar.gz: 49287ecaa021b356bf48eafbe79135b4dbcc5172b7ddb918d837fdfb8aea0856
+  metadata.gz: 69ff32208dd9d65b179b6caaf8cb91e7b346733cb487913f7d25b7126fb8a7cd
+  data.tar.gz: d8252a3ee862afc836c4c724f5a64a23287dc35b49d44d0b65bba9fe730d6725
 SHA512:
-  metadata.gz: 318c39772d51a114597438aef45e84d9a627f3132b6ac2d091254fa5e674bc0bc133701829cec11b667e92e367cc07f83e925c5f07cf2332defe7c6e7163eb27
-  data.tar.gz: b987744fdbb5aa0dce30538be6d58e68b9b0e00b03de5b58fb817906fdcbed9a5c47f62a49092ec21e736e67dc1d1f5451a13b13136c50f3a08328e24c8b34e6
+  metadata.gz: 90b610e9567a9cb0d08c5e40cc3909964c868cfec58ffe963c598cf187e715259114a719019c616099ebe243714d29de3b99f52e9e5a701bd900f410fcf923a9
+  data.tar.gz: 134f3d56152ef9b2db4e01bdd79a9ac458a5ee4bde3cc23121148e6be26b3403e38a11b4cf4a4d27ae80a246d9ba8e5601aadb5edb1d97344dca50452c5af9e3

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

@@ -38,7 +38,7 @@ module Uc3DmpId
         raise CreatorError, MSG_UNABLE_TO_MINT if p_key.nil?
 
         # Add the DMPHub specific attributes and then save
-        annotated = Helper.annotate_dmp_json(provenance: provenance, owner_org: owner_org, p_key: p_key, json: json['dmp'])
+        annotated = Helper.annotate_dmp_json(provenance: provenance, p_key: p_key, json: json['dmp'])
         puts "CREATING DMP ID:" if debug
         puts annotated if debug
 
@@ -47,7 +47,7 @@ module Uc3DmpId
         raise CreatorError, Uc3DmpId::MSG_DMP_NO_DMP_ID if resp.nil?
 
         _post_process(json: annotated, debug: debug)
-        Helper.cleanse_dmp_json(json: annotated)
+        Helper.cleanse_dmp_json(json: JSON.parse({ dmp: annotated }.to_json))
       end
 
       private

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

@@ -133,16 +133,33 @@ module Uc3DmpId
         a == b
       end
 
+      # Extract the Contact's ORCID id
+      def extract_owner_id(json: {})
+        return nil unless json.is_a?(Hash)
+
+        dmp = json['dmp'].nil? ? json : json['dmp']
+        owner_org = dmp.fetch('contact', {}).fetch('contact_id', {})['identifier']
+
+        orgs = dmp.fetch('contributor').map do { |contributor| contributor.fetch('contact_id', {})['identifier'] }
+        orgs.first
+      end
+
       # Extract the Contact's affiliaiton ROR ID
       def extract_owner_org(json: {})
         return nil unless json.is_a?(Hash)
 
         dmp = json['dmp'].nil? ? json : json['dmp']
         owner_org = dmp.fetch('contact', {}).fetch('dmproadmap_affiliation', {}).fetch('affiliation_id', {})['identifier']
+        return owner_org unless owner_org.nil?
+
+        orgs = dmp.fetch('contributor').map do |contributor|
+          contributor.fetch('dmproadmap_affiliation', {}).fetch('affiliation_id', {})['identifier']
+        end
+        orgs.compact.max_by { |i| orgs.count(i) }
       end
 
       # Add DMPHub specific fields to the DMP ID JSON
-      def annotate_dmp_json(provenance:, owner_org:, p_key:, json:)
+      def annotate_dmp_json(provenance:, p_key:, json:)
         json = parse_json(json: json)
         return json if provenance.nil? || owner_org.nil? || p_key.nil? || !json.is_a?(Hash)
 
@@ -157,9 +174,13 @@ module Uc3DmpId
         # Ensure that the :dmp_id matches the :PK
         annotated['dmp_id'] = pk_to_dmp_id(p_key: remove_pk_prefix(p_key: annotated['PK']))
 
+        owner_id = extract_owner_id(json: json)
+        owner_org = extract_owner_org(json: json)
+
         # Update the modification timestamps
         annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
-        annotated['dmphub_owner_org'] = owner_org.to_s
+        annotated['dmphub_owner_id'] = owner_id unless owner_id.nil?
+        annotated['dmphub_owner_org'] = owner_org unless owner_org.nil?
         annotated['dmphub_updated_at'] = Time.now.iso8601
         # Only add the Creation date if it is blank
         annotated['dmphub_created_at'] = Time.now.iso8601 if json['dmphub_created_at'].nil?
@@ -181,10 +202,6 @@ module Uc3DmpId
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       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,92 @@ 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)
+        # 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, 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.63'
+  VERSION = '0.0.65'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.63
+  version: 0.0.65
 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