uc3-dmp-id 0.1.57 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 141e0ecd0482b349f2b98f2d41029623f42c755324bb6ab0347c1703d224393f
-  data.tar.gz: 8872a059855cb558f884a2b8542c8dece13aaad36c7b73679d90f7e129e6667b
+  metadata.gz: 59344bea0d31538592f45cc51bda5971e9834ba66ba6b75b99f25bc188307782
+  data.tar.gz: b57a971d2734b20cda13bd67df9f8c1e1f14f3c80d17eb6dc92d0a00ac28e3e0
 SHA512:
-  metadata.gz: 26f0b387fcc3417459c6a0b2363f6a6aa1ab8bade5690679ce60e2ecb8a010ec5e2bcf34d442f4fe93f5e0206cacef679842feea67b76bb9d0cbd54a14a57bf1
-  data.tar.gz: 143a749ad8e6f425360b5b8f8aa55c58be4a046a1b858360bdb9f6154bf75b891956436a33ecc045324f1a4abd64ac9d450c7e7b1616f9a3dc7f32e314bbddf9
+  metadata.gz: 90bee71bd0005f49adb736c0ba5fad0d75e40b12815cb46bc0a73352e841bd7b2372e7038282427d7dbfda05fd7f060e04500c4588ce578424a7632bd19510fd
+  data.tar.gz: 958e3d10549189e8e7d47d950cb27dddb84623f1d8b13d23386b555c773cfe3b8ecbef41d4221a225b84dbcd7f5079701f98218947aff58156fd2e8fe5b18946

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

@@ -139,10 +139,10 @@ module Uc3DmpId
 
         if !(owner.to_s.strip =~ orcid_regex).nil?
           args = {
-            filter_expression: 'contains(:people_ids, people) AND :sk = sk',
+            filter_expression: 'contains(people_ids, :orcids) AND SK = :sk',
             expression_attribute_values: {
               ':sk': 'METADATA',
-              ':people_ids': [
+              ':orcids': [
                 "http://#{ORCID_DOMAIN}/#{owner}",
                 "https://#{ORCID_DOMAIN}/#{owner}"
               ]
@@ -150,8 +150,8 @@ module Uc3DmpId
           }
         elsif !email.nil?
           args = {
-            filter_expression: 'contains(:people, people) AND :sk = sk',
-            expression_attribute_values: { ':sk': 'METADATA', ':people': [email] }
+            filter_expression: 'contains(people, :email) AND SK = :sk',
+            expression_attribute_values: { ':sk': 'METADATA', ':email': [email.gsub('%40', '@')] }
           }
         else
           # It wasn't an email or ORCID, so return an empty array
@@ -168,10 +168,10 @@ module Uc3DmpId
         ror = org.strip unless (org.to_s =~ regex).nil?
 
         args = {
-          filter_expression: 'contains(:affiliation_ids, affiliation_ids) AND :sk = sk',
+          filter_expression: 'contains(affiliation_ids, :rors) AND SK = :sk',
           expression_attribute_values: {
             ':sk': 'METADATA',
-            ':affiliation_ids': [
+            ':rors': [
               "http://#{ROR_DOMAIN}/#{ror}",
               "https://#{ROR_DOMAIN}/#{ror}"
             ]
@@ -188,10 +188,10 @@ module Uc3DmpId
         ror = funder.strip unless (funder.to_s =~ regex).nil?
 
         args = {
-          filter_expression: 'contains(:funder_ids, funder_ids) AND :sk = sk',
+          filter_expression: 'contains(funder_ids, :rors) AND SK = :sk',
           expression_attribute_values: {
             ':sk': 'METADATA',
-            ':funder_ids': [
+            ':rors': [
               "http://#{ROR_DOMAIN}/#{ror}",
               "https://#{ROR_DOMAIN}/#{ror}"
             ]
@@ -205,7 +205,7 @@ module Uc3DmpId
       # Fetch the DMP IDs that are marked as featured
       def _by_featured(client: nil, logger: nil)
         args = {
-          filter_expression: ':featured = featured AND :sk = sk',
+          filter_expression: 'featured = :featured AND SK = :sk',
           expression_attribute_values: { ':sk': 'METADATA', ':featured': 1 }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_featured - scan args', details: args)
@@ -216,7 +216,7 @@ module Uc3DmpId
       # Return all of the publicly visible DMPs
       def _publicly_visible(client: nil, logger: nil)
         args = {
-          filter_expression: ':visibility = visibility AND :sk = sk',
+          filter_expression: 'visibility = :visibility AND SK = :sk',
           expression_attribute_values: { ':sk': 'METADATA', ':visibility': 'public' }
         }
         logger&.debug(message: 'Fetch relevant DMPs _publicly_visible - scan args', details: args)

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

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

metadata

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