uc3-dmp-id 0.0.119 → 0.0.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a11cc424db9e42423e19c76630d0a765a3b97f9c767eb7e40ef51a8b223c68
-  data.tar.gz: ace4fae3b2c6c8c8aa259de6bc887f4302c606450d9e70d041d6b14761db05a9
+  metadata.gz: 6a7b18e8a03e8b1fec669c319659352f4cee0fc5d726c92a45c178ea37116375
+  data.tar.gz: 4239900d4abfe0c89126ba713d135b55ede35b05db53671390fabab773372933
 SHA512:
-  metadata.gz: 5302de9eda8ba796bd5ccc958542c2915c9cda5af8d65f600b3e0583c5151dbb618ec657e71b111406206e803df03435097a24e4dadf7a66fff7a35edce63096
-  data.tar.gz: e664b942efd9104a386d9f52a584cda0dbd3d37f98a608c9144c40952760c4594e10a68514262fcaa1c465fcb30e3fc88e8306408048f501ac73d40825bc7cd4
+  metadata.gz: 8e2d9142e4adcc5604ee23d35d16f3f06c48f872476d049223293c6779c89ec5cdb5b5db80a0ad27ded0c46110d105ed41351b55b4dcc655b9eec698b56ddb1a
+  data.tar.gz: 93393c6f351ceef8afdf2f59213f58ac8a908bde9511d67e263e780b1bc2d0120ed0d9de02a6a93e9151e5289176162473929afc7de65952aa1cab354ee781a6

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module Uc3DmpId
   class AsserterError < StandardError; end
 
@@ -38,7 +40,7 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
 
         # 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['dmphub_updated_at'] == modified_version['dmphub_updated_at'] ||
+        return modified_version if latest_version['modified'] == modified_version['modified'] ||
                                    (latest_version.fetch('dmphub_assertions', []).empty? &&
                                     modified_version.fetch('dmphub_assertions', []).empty?)
 
@@ -48,9 +50,9 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
         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 dmphub_updated_at on the incoming changes
+        # Keep any assetions that were made after the modified on the incoming changes
         modified_version['dmphub_assertions'] = existing_assertions.select do |entry|
-          !entry['timestamp'].nil? && Time.parse(entry['timestamp']) > Time.parse(modified_version['dmphub_updated_at'])
+          !entry['timestamp'].nil? && Time.parse(entry['timestamp']) > Time.parse(modified_version['modified'])
         end
         return modified_version unless incoming_assertions.any?
 
@@ -105,7 +107,7 @@ puts "MODIFIED_VERSION ASSERTIONS: #{modified_version['dmphub_assertions']}"
         JSON.parse({
           id: SecureRandom.hex(4).upcase,
           provenance: updater.gsub('PROVENANCE#', ''),
-          timestamp: Time.now.iso8601,
+          timestamp: Time.now.utc.iso8601,
           status: 'new',
           note: note,
           assertions: mods

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'securerandom'
+require 'time'
 
 module Uc3DmpId
   class CreatorError < StandardError; end
@@ -40,6 +41,11 @@ module Uc3DmpId
         annotated = Helper.annotate_dmp_json(provenance: provenance, p_key: p_key, json: json['dmp'])
         logger.info(message: "Creating DMP ID: #{p_key}") if logger.respond_to?(:debug)
 
+        # Set the :created and :modified timestamps
+        now = Time.now.utc.iso8601
+        annotated['created'] = now
+        annotated['modified'] = now
+
         # Create the item
         resp = client.put_item(json: annotated, logger: logger)
         raise CreatorError, Uc3DmpId::MSG_DMP_NO_DMP_ID if resp.nil?

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module Uc3DmpId
   class DeleterError < StandardError; end
 
@@ -27,10 +29,14 @@ module Uc3DmpId
 
         # Annotate the DMP ID
         dmp['dmp']['SK'] = Helper::DMP_TOMBSTONE_VERSION
-        dmp['dmp']['dmphub_tombstoned_at'] = Time.now.iso8601
+        dmp['dmp']['dmphub_tombstoned_at'] = Time.now.utc.iso8601
         dmp['dmp']['title'] = "OBSOLETE: #{dmp['title']}"
         logger.info(message: "Tomstoning DMP ID: #{p_key}") if logger.respond_to?(:debug)
 
+        # Set the :modified timestamps
+        now = Time.now.utc.iso8601
+        dmp['modified'] = now
+
         # Create the Tombstone version
         resp = client.put_item(json: dmp, logger: logger)
         raise DeleterError, MSG_DMP_NO_TOMBSTONE if resp.nil?

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

@@ -132,7 +132,7 @@ module Uc3DmpId
         b = deep_copy_dmp(obj: dmp_b)
 
         # ignore some of the attributes before comparing
-        %w[SK dmphub_modification_day dmphub_updated_at dmphub_created_at dmphub_assertions].each do |key|
+        %w[SK dmphub_modification_day modified created dmphub_assertions].each do |key|
         a['dmp'].delete(key) unless a['dmp'][key].nil?
         b['dmp'].delete(key) unless b['dmp'][key].nil?
         end
@@ -167,6 +167,7 @@ module Uc3DmpId
       # Add DMPHub specific fields to the DMP ID JSON
       def annotate_dmp_json(provenance:, p_key:, json:)
         json = parse_json(json: json)
+        bool_vals = [1, '1', true, 'true', 'yes']
         return json if provenance.nil? || p_key.nil? || !json.is_a?(Hash)
 
         # Fail the json as is if the :PK does not match the :dmp_id if the json has a :PK
@@ -183,13 +184,13 @@ module Uc3DmpId
         owner_id = extract_owner_id(json: json)
         owner_org = extract_owner_org(json: json)
 
+        # Set the :dmproadmap_featured flag appropriately
+        annotated['dmproadmap_featured'] = bool_vals.include?(annotated['dmproadmap_featured']&.downcase) ? 1 : 0
+
         # Update the modification timestamps
         annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
         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 if annotated['dmphub_updated_at'].nil?
-        # Only add the Creation date if it is blank
-        annotated['dmphub_created_at'] = Time.now.iso8601 if json['dmphub_created_at'].nil?
         return annotated unless json['dmphub_provenance_id'].nil?
 
         annotated['dmphub_provenance_id'] = provenance.fetch('PK', '')
@@ -218,7 +219,7 @@ module Uc3DmpId
         return json.map { |obj| cleanse_dmp_json(json: obj) }.compact if json.is_a?(Array)
 
         cleansed = {}
-        allowable = %w[dmphub_created_at dmphub_updated_at dmphub_versions]
+        allowable = %w[dmphub_versions]
         json.each_key do |key|
           next if (key.to_s.start_with?('dmphub') && !allowable.include?(key)) || %w[PK SK].include?(key.to_s)
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'securerandom'
+require 'time'
 
 module Uc3DmpId
   class UpdaterError < StandardError; end
@@ -42,6 +43,10 @@ module Uc3DmpId
         version = _process_modifications(owner: owner, updater: updater, version: version, mods: mods, note: note,
                                          logger: logger)
 
+        # Set the :modified timestamps
+        now = Time.now.utc.iso8601
+        version['modified'] = now
+
         # Save the changes
         resp = client.put_item(json: version, logger: logger)
         raise UpdaterError, MSG_DMP_UNABLE_TO_VERSION if resp.nil?

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

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

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'uc3-dmp-dynamo'
+require 'time'
 
 module Uc3DmpId
   class VersionerError < StandardError; end
@@ -19,19 +20,19 @@ module Uc3DmpId
           key_conditions: {
             PK: { attribute_value_list: [Helper.append_pk_prefix(p_key: p_key)], comparison_operator: 'EQ' }
           },
-          projection_expression: 'dmphub_updated_at',
+          projection_expression: 'modified',
           scan_index_forward: false
         }
         client = client.nil? ? Uc3DmpDynamo::Client.new : client
         client.query(args: args, logger: logger)
       end
 
-      # Generate a snapshot of the current latest version of the DMP ID using the existing :dmphub_updated_at as
+      # Generate a snapshot of the current latest version of the DMP ID using the existing :modified as
       # the new SK.
       # rubocop:disable Metrics/AbcSize,  Metrics/CyclomaticComplexity,  Metrics/PerceivedComplexity
       def generate_version(client:, latest_version:, owner:, updater:, logger: nil)
         # Only create a version if the Updater is not the Owner OR the changes have happened on a different day
-        mod_time = Time.parse(latest_version.fetch('dmphub_updated_at', Time.now.iso8601))
+        mod_time = Time.parse(latest_version.fetch('modified', Time.now.utc.iso8601))
         now = Time.now
         if mod_time.nil? || !(now - mod_time).is_a?(Float)
           logger.error(message: "#{SOURCE} unable to determine mod time: #{mod_time}") if logger.respond_to?(:debug)
@@ -47,10 +48,10 @@ module Uc3DmpId
           return latest_version
         end
 
-        # Make a copy of the latest_version and then update it's SK to the :dmphub_updated_at to mark it in a point of time
+        # Make a copy of the latest_version and then update it's SK to the :modified to mark it in a point of time
         # We essentially make a snapshot of the record before making changes
         prior = Helper.deep_copy_dmp(obj: latest_version)
-        prior['SK'] = "#{Helper::SK_DMP_PREFIX}#{latest_version['dmphub_updated_at'] || Time.now.iso8601}"
+        prior['SK'] = "#{Helper::SK_DMP_PREFIX}#{latest_version['modified'] || Time.now.utc.iso8601}"
         # Create the prior version record ()
         client = client.nil? ? Uc3DmpDynamo::Client.new : client
         resp = client.put_item(json: prior, logger: logger)
@@ -58,9 +59,6 @@ module Uc3DmpId
 
         msg = "#{SOURCE} created version PK: #{prior['PK']} SK: #{prior['SK']}"
         logger.info(message: msg, details: prior) if logger.respond_to?(:debug)
-
-        # Set the modification dates to now and then return the latest version
-        latest_version['dmphub_updated_at'] = Time.now.iso8601
         latest_version
       end
       # rubocop:enable Metrics/AbcSize,  Metrics/CyclomaticComplexity,  Metrics/PerceivedComplexity
@@ -75,10 +73,10 @@ module Uc3DmpId
         return json unless results.length > 1
 
         versions = results.map do |ver|
-          next if ver['dmphub_updated_at'].nil?
+          next if ver['modified'].nil?
           {
-            timestamp: ver['dmphub_updated_at'],
-            url: "#{Helper.landing_page_url}#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{ver['dmphub_updated_at']}"
+            timestamp: ver['modified'],
+            url: "#{Helper.landing_page_url}#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{ver['modified']}"
           }
         end
         json['dmp']['dmphub_versions'] = JSON.parse(versions.to_json)

metadata

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