uc3-dmp-id 0.1.73 → 0.1.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30470f9547ebdbc1a5e8928be0fad068d5c3f1b485d78a4b12fc76eae53cfe67
-  data.tar.gz: 19a4aed6a4f3c3cd8ac29b2b8a719b4a0829d22c0b4a1cf1320640ad5868bbb7
+  metadata.gz: 18cc7a2a74f91898c76cb8686c511023bc31dd2147d92bd172ae7a00a2dd72b3
+  data.tar.gz: ab9b8e2009e384fc1b20a99ea92dc92ddabc1779c9c6d02ed369d171724766cb
 SHA512:
-  metadata.gz: 3e7cee4b2f06b160c1a350a6d47aba1fcd0402800e6ed8a9a884dc1a6a8b6cedb7d8dacc3186c6cf51ad7e39eeff9d80e85f161c7e0662dd159457a94257d33c
-  data.tar.gz: 5c6d819af9a1be470da73fa98df34412a44f5f203260a5287d5c5131bc4e25478836047e5c421f19d736717495b980d88dacf13241d2e06824ae36bb9cc913fe
+  metadata.gz: d989d0ea6f7e7cb0486f9b7982a40f4085dc4056576c7f4bb0225b5d37f1fb9175fc57f3628a3d1e1cd2cf342305fb79791681798657c58f0be6bccc61bee5aa
+  data.tar.gz: 71379ba74f63add7f9443b0a85b30cb64664e5602499cabd91f27512a5b0567bb88f83e9890efd42e8b6914267457aabfb177ee616eb3925939991c147e1fe4d

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

@@ -141,12 +141,12 @@ module Uc3DmpId
 
         logger.debug(message: 'Modifications before merge.', details: mods) if logger.respond_to?(:debug)
         keys_to_retain = version.keys.select do |key|
-          (key.start_with?('dmphub_') && !%w[dmphub_modifications dmphub_versions].include?(key)) ||
-            key.start_with?('PK') || key.start_with?('dmproadmap_related_identifiers')
-        end
-        keys_to_retain.each do |key|
-          mods[key] = version[key]
+          key.start_with?('dmphub_') &&
+            !%w[dmphub_modifications dmphub_versions].include?(key)
         end
+        keys_to_retain.each { |key| mods[key] = version[key] }
+
+        mods['PK'] = version['PK']
         mods['SK'] = Helper::DMP_LATEST_VERSION
         logger.debug(message: 'Modifications after merge.', details: mods) if logger.respond_to?(:debug)
         mods
@@ -242,7 +242,7 @@ module Uc3DmpId
                 descriptor: related['descriptor'],
                 citation: related['citation']
               }.to_json
-            elsif exists
+            elsif related['status'] != 'approved' && existing.any?
               # otherwise remove it
               json['dmproadmap_related_identifiers'] = json['dmproadmap_related_identifiers'].reject { |ri| ri == existing.first }
             end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.73
+  version: 0.1.75
 platform: ruby
 authors:
 - Brian Riley