dmp-dynamo_adapter 0.2.8 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fde969438aa9681c5213d60e441b3187de1ed2141c7b244419ba47a007d39fc
-  data.tar.gz: a4a9722f607edf91644043c4adbcb3af7bfe81f33d254da104a0223a27fd6c40
+  metadata.gz: 80c519bd779bdfc10d50d22b12e61f75a1809c9f54feef84c5f8bf4373bd7665
+  data.tar.gz: 9f37c7e34d64b0a5594fef9b0951c89f4d76ddd3478577b4afc3f37d1fd004a5
 SHA512:
-  metadata.gz: 0ba67f79d6cdf0b4d29f416301e88b8b4453f85b7381a82280f5389dde4c12bb5446e59bdd21290d04203dbcdaefc73f08c1bd8ffd5221b945a19e514e4f1c2b
-  data.tar.gz: 8c2a12ccd6b1049a12f254a6ae5f634c63aa2c3b82870778fd541482d6888cd720426ac6cb213d72b6fb3605ad38a3b948abf7393f63b90cc3898fa72f60966e
+  metadata.gz: 812e6b3c2e47c7192c352b1c563d047405b8a896fcd115c9f7d3497f9b6c82f21443a828b17c0d62c8b7023a20da4c788664003742be0358b9aa1559142ae474
+  data.tar.gz: bfb81e6b453cb83e63c94a939a5dcdba10ca105cd071eb8de1926ff7591e45c043dbc117c11ea463e772090c9bab895e19d8cdcfc959803ff654c9b541c8a011

data/lib/dmp/dmp_id_handler.rb

@@ -10,7 +10,7 @@ module Dmp
 
     class << self
       def dmp_id_base_url
-        ENV['DMP_ID_BASE_URL'].end_with?('/') ? ENV['DMP_ID_BASE_URL'] : "#{ENV['DMP_ID_BASE_URL']}/"
+        ENV['DMP_ID_BASE_URL']&.end_with?('/') ? ENV['DMP_ID_BASE_URL'] : "#{ENV['DMP_ID_BASE_URL']}/"
       end
 
       # Format the DMP ID in the way we want it

data/lib/dmp/dynamo_adapter.rb

@@ -70,7 +70,8 @@ p "FINDING BY PK: PK - #{p_key.inspect} / SK - #{s_key.inspect}"
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
-      return { status: 404, error: MSG_NOT_FOUND } if response[:item].nil?
+      return { status: 404, error: MSG_NOT_FOUND } if response[:items].nil? ||
+                                                      response[:items].empty?
 
       { status: 200, items: [response[:item]] }
     rescue Aws::Errors::ServiceError => e
@@ -129,11 +130,14 @@ p "PUTTING ITEM:"
           return_consumed_capacity: @debug_mode ? 'TOTAL' : 'NONE'
         }
       )
+      # Fetch the newly created record
+      response = find_by_pk(p_key: p_key, s_key: Dmp::MetadataHandler::LATEST_VERSION)
+      return { status: 500, error: MSG_DEFAULT } unless response[:status] == 200
 
 p 'CREATED!?'
-pp response.data
+pp response[:items]
 
-      { status: 201, items: [response.data] }
+      { status: 201, items: response[:items] }
     rescue Aws::DynamoDB::Errors::DuplicateItemException
       { status: 405, error: MSG_EXISTS }
     rescue Aws::Errors::ServiceError => e
@@ -176,7 +180,7 @@ p ''
 
       json = splice_json(original_version: version_result[:items].first&.item, new_version: json)
 
-p ''
+# p ''
 p "AFTER:"
 pp json
 
@@ -253,7 +257,8 @@ pp json
     # Attempt to find the DMP item by its 'is_metadata_for' :dmproadmap_related_identifier
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def find_by_dmphub_provenance_identifier(json:)
-      return { status: 400, error: MSG_DEFAULT } if json.nil? || json.fetch('dmp_id', {})['identifier'].nil?
+      return { status: 400, error: MSG_DEFAULT } if json.nil? ||
+                                                    json.fetch('dmp_id', {})['identifier'].nil?
 
 p "FINDING BY PROVENANCE ID: #{json['dmp_id']['identifier']}"
 

data/lib/dmp/metadata_handler.rb

@@ -74,7 +74,7 @@ p "ANNOTATING METADATA:"
         annotated['dmp_id'] = Dmp::DmpIdHandler.pk_to_dmp_id(p_key: annotated['PK'])
 
         # Update the modification timestamps
-        annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%M-%d')
+        annotated['dmphub_modification_day'] = Time.now.strftime('%Y-%m-%d')
         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?
@@ -85,7 +85,7 @@ p "ANNOTATING METADATA:"
                             json.fetch('dmp_id', {})['identifier'].nil?
 
         # Record the original Provenance system's identifier
-        annotated['dmphub_provenance_identifier'] = json['dmp_id']
+        annotated['dmphub_provenance_identifier'] = json.fetch('dmp_id', {})['identifier']
         annotated
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmp-dynamo_adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.1
 platform: ruby
 authors:
 - briri