uc3-dmp-id 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c916c27dc8eac1cb0ef5b40a5d3fc4e4e07ce34f1bb599f208e919442d6c7f2b
-  data.tar.gz: 7803e305538f4cce36ca021125ae1161cd201d8db4dd25cf8fe026ae28a53011
+  metadata.gz: e8ed82601dab8f040bdef2ca093b8a2c90f81160c5a990533947ff3750a5d97c
+  data.tar.gz: 563c25f02e5c85a41960bad34687bdb4376228cce26e00a8c92024ab4f289055
 SHA512:
-  metadata.gz: 2738c8c874bd31cef0c6726de4cafb6378c8e1aa374223a478dcfdd42be0a28d1a929e04ec797d5cfe14748bb2a07eb1a1da723b7164b2ec0e12c6942922065a
-  data.tar.gz: 34e267e65d8db9b497a9673f355a97a21ad92820f6d8e1a98c9102017d8abce21695904bf7a8547568e0b5577364af3f86cc52c7c59ea4d37bfa528c0494d720
+  metadata.gz: fdd55f05e2c95cf243e8398070e9d690e4ecf7d2d35ba639f937956298e2dcb6c28e9d5600af8a846b7bc8bc0c507b1456f55a56f82f80c456a885311e64e84b
+  data.tar.gz: 0ae5115a0d8856b72f10f86afe311e835e6bf52a950eaf5dd87a3b4af5acae3ad72958c3198485f53ff56184df2034f6c9347d69f745ad71b4d7e9d35e670fd1

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

@@ -79,7 +79,7 @@ module Uc3DmpId
         dmp_id = ''
         counter = 0
         while dmp_id == '' && counter <= 10
-          prefix = "#{ENV.fetch('DMP_ID_SHOULDER', nil)}#{SecureRandom.hex(2).upcase}#{SecureRandom.hex(2)}"
+          prefix = "#{ENV.fetch('DMP_ID_SHOULDER', nil)}#{SecureRandom.hex(2).upcase}#{SecureRandom.hex(2).upcase}"
           dmp_id = prefix unless Finder.exists?(client:, p_key: prefix)
           counter += 1
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'uc3-dmp-dynamo'
+require 'securerandom'
 
 module Uc3DmpId
   class FinderError < StandardError; end
@@ -75,6 +76,9 @@ module Uc3DmpId
         dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
         return nil if dmp['dmp']['PK'].nil?
 
+        # Attach any harvester mods to the JSON
+        dmp['dmp'] = _attach_harvester_mods(client:, p_key:, json: dmp['dmp'], logger:)
+
         dmp = Versioner.append_versions(p_key: dmp['dmp']['PK'], dmp:, client:, logger:) if cleanse
         dmp = _remove_narrative_if_private(json: dmp)
         cleanse ? Helper.cleanse_dmp_json(json: dmp) : dmp
@@ -224,6 +228,46 @@ module Uc3DmpId
         end
         json
       end
+
+      # Fetch any Harvester modifications and attach them to the JSON in the way the DMPTool expects
+      # TODO: eventually just update the rebuilt DMPTool to work with the HARVESTER_MODS records as-is
+      def _attach_harvester_mods(client:, p_key:, json:, logger: nil)
+        # Fetch the `"SK": "HARVESTER_MODS"` record
+        client = Uc3DmpDynamo::Client.new if client.nil?
+        resp = client.get_item(
+          key: { PK: Helper.append_pk_prefix(p_key:), SK: Helper::SK_HARVESTER_MODS }, logger:
+        )
+        return json unless resp.is_a?(Hash)
+
+        mods = []
+        resp.fetch('related_works', {}).each do |key, val|
+          rec = val.dup
+          next if rec['provenance'].nil?
+
+          # Change the name of the `logic` array to `notes`
+          rec['notes'] = rec['logic']
+          # For `work-type` that equal `outputmanagementplan`, change it to `output_management_plan`
+          rec['work_type'] = 'output_management_plan' if rec['work_type'] == 'outputmanagementplan'
+
+          # The old `dmphub_modifications` array was grouped by provenance
+          prov_array = mods.select { |entry| entry['provenance'] == rec['provenance'] }
+          if prov_array.any?
+            prov_array << rec
+          else
+            mods << {
+              id: "#{Time.now.utc.strftime('%Y-%m-%d')}-#{SecureRandom.hex(4)}",
+              provenance: rec['provenance'],
+              augmenter_run_id: SecureRandom.hex(8),
+              timestamp: rec['discovered_at'].nil? ? Time.now.utc.iso8601 : rec['discovered_at'],
+              dmproadmap_related_identifiers: [rec],
+              funding: []
+            }
+          end
+        end
+        # Add a `dmphub_modifications` array to the JSON
+        json['dmphub_modifications'] = JSON.parse(mods.to_json)
+        json
+      end
     end
   end
 end

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

@@ -12,6 +12,8 @@ module Uc3DmpId
     SK_DMP_PREFIX = 'VERSION#'
     SK_DMP_REGEX = /VERSION#\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}/
 
+    SK_HARVESTER_MODS = "HARVESTER_MODS"
+
     # TODO: Verify the assumed structure of the DOI is valid
     DOI_REGEX = %r{[0-9]{2}\.[0-9]{4,}/[a-zA-Z0-9/_.-]+}
     URL_REGEX = %r{(https?://)?([a-zA-Z0-9\-_]\.)+[a-zA-Z0-9\-_]{2,3}(:[0-9]+)?/?}

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

@@ -43,6 +43,9 @@ module Uc3DmpId
         # Bail if the system trying to make the update is not the creator of the DMP ID
         raise UpdaterError, Helper::MSG_DMP_FORBIDDEN if owner != updater
 
+        # Handle any changes to the dmphub_modifications section
+        version = _process_harvester_mods(client:, p_key:, json: version, logger:)
+
         # Remove the version info because we don't want to save it on the record
         version.delete('dmphub_versions')
 
@@ -177,6 +180,34 @@ module Uc3DmpId
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
       # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+
+      # Fetch any Harvester modifications to the JSON
+      def _process_harvester_mods(client:, p_key:, json:, logger: nil)
+        return json if json.fetch('dmphub_modifications', []).empty?
+
+        # Fetch the `"SK": "HARVESTER_MODS"` record
+        client = Uc3DmpDynamo::Client.new if client.nil?
+        resp = client.get_item(
+          key: { PK: Helper.append_pk_prefix(p_key:), SK: Helper::SK_HARVESTER_MODS }, logger:
+        )
+        return json unless resp.is_a?(Hash) && resp['related_works'].is_a?(Hash)
+
+        # The `dmphub_modifications` array will ONLY ever have things the harvester mods know about
+        # so just find them and update the status accordingly
+        mods = resp.dup
+        json['dmphub_modifications'].each do |entry|
+          next if entry.fetch('dmproadmap_related_identifiers', []).empty?
+
+          entry['dmproadmap_related_identifiers'].each do |related|
+            next if mods['related_works'][related.identifier].nil?
+
+            mods['related_works'][related.identifier]['status'] = related['status']
+          end
+        end
+        client.put_item(json: mods, logger:)
+        json.delete('dmphub_modifications')
+        json
+      end
     end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.34
 platform: ruby
 authors:
 - Brian Riley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json