uc3-dmp-id 0.0.137 → 0.0.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af278f46689bcbd4b37c3d83a8ab76fdf6af75c120967145a2fdff8ed1903085
-  data.tar.gz: 4a78d04de196ff1e13e97b4b94d17758bb221d103909af1d300e947a80c80ccd
+  metadata.gz: cb9d04c54e282c729615f79d23b6269419b885c85ead76717df87d3d913a99ee
+  data.tar.gz: d197c9c56d42e339b80863de0bc2f4cadbb0e813663925c27a70df9149f586da
 SHA512:
-  metadata.gz: e57eefaa818f2f1344a6109f8510f6009f3f58cb566925d501633cc6c1b86c064026668362522ee812cd5017bd7e3fab69468470e3ec604f0b2ced8adb200c54
-  data.tar.gz: acb63c70fbeb26f7138a0dcf94ba2d5ed60a7bcbadfac07bc8ad7f52943bf0a119b8b704f663717d2e1e6d6537c898f9cd28dad8d4d3c831e28aa1a9218fa63c
+  metadata.gz: 6c6c0fb8f00efd9f29bed43ca71519c6e35728671cf322054ede4d2abb3e19cf6a7452f58126408d607c8a9c1978308eb07f002c0c3462cd01d443476fb2e7bd
+  data.tar.gz: 342cb856af47d06a18c6041784a8c379c4458d58bed55b609ec78c509453adb4c150e338408780c663c6bbd55b2c0ff86094d990dfc8e775e9f9de55ee63ee98

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

@@ -22,42 +22,42 @@ puts "ADDING ASSERTIONS: #{mods}"
         # Return the DMP ID as-is if there are no assertable changes
         return dmp if contact.nil? && contributor.empty? && project.empty?
 
-        # Clone any existing assertions on the current DMP ID so we can manipulate them
-        assertions = Helper.deep_copy_dmp(obj: dmp.fetch('dmphub_assertions', []))
+        # Clone any existing pending_assertions on the current DMP ID so we can manipulate them
+        assertions = Helper.deep_copy_dmp(obj: dmp.fetch('dmphub_modifications', []))
         # Return the DMP ID as-is if the assertion is already on the record
-        return dmp if assertions.select { |entry| entry['provenance'] == updater && entry['assertions'] == mods }
+        return dmp if assertions.select { |entry| entry['provenance'] == updater && entry['pending_assertions'] == mods }
 
         assertions << _generate_assertion(updater: updater, mods: mods, note: note)
-        dmp['dmphub_assertions'] = assertions.flatten
+        dmp['dmphub_modifications'] = assertions.flatten
         dmp
       end
 
       # Splice together assertions made while the user was updating the DMP ID
       def splice(latest_version:, modified_version:, logger: nil)
 
-puts "LATEST_VERSION ASSERTIONS: #{latest_version['dmphub_assertions']}"
-puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
+puts "LATEST_VERSION ASSERTIONS: #{latest_version['dmphub_modifications']}"
+puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_modifications']}"
 
         # Return the modified_version if the timestamps are the same (meaning no new assertions were made while the
         # user was working on the DMP ID) OR neither version has assertions
         return modified_version if latest_version['modified'] == modified_version['modified'] ||
-                                   (latest_version.fetch('dmphub_assertions', []).empty? &&
-                                    modified_version.fetch('dmphub_assertions', []).empty?)
+                                   (latest_version.fetch('dmphub_modifications', []).empty? &&
+                                    modified_version.fetch('dmphub_modifications', []).empty?)
 
         # Clone any existing assertions on the current DMP ID so we can manipulate them
-        existing_assertions = Helper.deep_copy_dmp(obj: latest_version.fetch('dmphub_assertions', []))
-        incoming_assertions = Helper.deep_copy_dmp(obj: modified_version.fetch('dmphub_assertions', []))
+        existing_assertions = Helper.deep_copy_dmp(obj: latest_version.fetch('dmphub_modifications', []))
+        incoming_assertions = Helper.deep_copy_dmp(obj: modified_version.fetch('dmphub_modifications', []))
         logger.debug(message: "Existing assertions", details: existing_assertions) if logger.respond_to?(:debug)
         logger.debug(message: "Incoming modifications", details: incoming_assertions) if logger.respond_to?(:debug)
 
         # Keep any assetions that were made after the modified on the incoming changes
-        modified_version['dmphub_assertions'] = existing_assertions.select do |entry|
+        modified_version['dmphub_modifications'] = existing_assertions.select do |entry|
           !entry['timestamp'].nil? && Time.parse(entry['timestamp']) > Time.parse(modified_version['modified'])
         end
         return modified_version unless incoming_assertions.any?
 
         # Add any of the assertions still on the incoming record back to the latest record
-        incoming_assertions.each { |entry| modified_version['dmphub_assertions'] << entry }
+        incoming_assertions.each { |entry| modified_version['dmphub_modifications'] << entry }
         modified_version
       end
 
@@ -70,7 +70,7 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
       #    "provenance": "dmphub",
       #    "timestamp": "2023-07-07T14:50:23+00:00",
       #    "note": "data received from the NIH API",
-      #    "assertions": {
+      #    "pending_assertions": {
       #      "contact": {
       #        "name": "Wrong Person"
       #      },
@@ -80,6 +80,14 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
       #          "role": ["Investigation"]
       #        }
       #      ],
+      #      "dmproadmap_related_identifiers": [
+      #        {
+      #          "work_type": "article",
+      #          "descriptor": "is_cited_by",
+      #          "type": "doi",
+      #          "identifier": "https://dx.doi.org/99.9876/ZYX987.V6"
+      #        }
+      #      ],
       #      "project": [
       #        {
       #          "start": "2024-01-01T00:00:00+07:00",
@@ -110,7 +118,7 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
           timestamp: Time.now.utc.iso8601,
           status: 'new',
           note: note,
-          assertions: mods
+          pending_assertions: mods
         }.to_json)
       end
     end

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

@@ -91,7 +91,7 @@ module Uc3DmpId
         json['dmphub_updater_is_provenance'] = true
         # Publish the change to the EventBridge
         publisher = Uc3DmpEventBridge::Publisher.new
-        publisher.publish(source: 'DmpCreator', dmp: json, logger: logger)
+        publisher.publish(source: 'DmpCreator', event_type: 'EZID update', dmp: json, logger: logger)
 
         # Determine if there are any related identifiers that we should try to fetch a citation for
         citable_identifiers = Helper.citable_related_identifiers(dmp: json)

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

@@ -67,7 +67,7 @@ module Uc3DmpId
         json['dmphub_updater_is_provenance'] = true
         # Publish the change to the EventBridge
         publisher = Uc3DmpEventBridge::Publisher.new
-        publisher.publish(source: 'DmpDeleter', dmp: json, logger: logger)
+        publisher.publish(source: 'DmpDeleter', event_type: 'EZID update', dmp: json, logger: logger)
         true
       end
     end

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

@@ -143,7 +143,7 @@ module Uc3DmpId
         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, logger: logger)
+        publisher.publish(source: 'DmpUpdater', event_type: 'EZID update', dmp: json, logger: logger)
 
         # Determine if there are any related identifiers that we should try to fetch a citation for
         citable_identifiers = Helper.citable_related_identifiers(dmp: json)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.137
+  version: 0.0.139
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json