uc3-dmp-id 0.1.52 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a126b7c8bbcf6836334748edef7a8ae44510b1c980c208de7448fffbb50f39df
-  data.tar.gz: d597f5f334d488e9dd1d1c25d475949daf9eb01b2a44d0166bdb8cb6f106bc4c
+  metadata.gz: a25055e5e62c689e02f190fe828bbe553ef380bcf6bcd2b2e2bb6299f80ea439
+  data.tar.gz: c51528de686f3786175ef6bfe2dcde9f1c86897d0fc6d5748667167021d55b54
 SHA512:
-  metadata.gz: c52f3a5bd533a0b00a6d76ee2f2f94f0cfa3bb581823411dfc2fa54d44e81ad807f54ed965b91ea8ee08c37d2861cd890ed501331804c813bab6b57203ccd0c4
-  data.tar.gz: c4c9bf7e8ee84bc89f2d41626de0421773377b1564144e35ce02c0d102b60f2be207ec8b04b5187e7c098691c4b20b9bbc2dff19e4180115ddb442e0712ab8ce
+  metadata.gz: c3a6afb5c512125d29ff1fc6a2da94de5aa98277f08e9fb46d7e120cd64d24238f8eb915f141a4df115feb89951f7e5753daf7c49358241fc7d718277e4d3aed
+  data.tar.gz: 7421c51628509d0e0c904625916fd56b43c6fecca16a131169568371f6b39acc274f730ca7d8942d4634daf30b89a7ddfa9f6acb63b634b3ad3fe2a3b8e1472b

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

@@ -139,7 +139,7 @@ module Uc3DmpId
 
         if email.nil?
           args = {
-            filter_expression: 'contains(:people_ids, people)',
+            filter_expression: 'contains(:people_ids, people) AND :sk = sk',
             expression_attribute_values: {
               ':sk': 'METADATA',
               ':people_ids': [
@@ -150,12 +150,12 @@ module Uc3DmpId
           }
         else
           args = {
-            filter_expression: 'contains(:people, people)',
+            filter_expression: 'contains(:people, people) AND :sk = sk',
             expression_attribute_values: { ':sk': 'METADATA', ':people': [email] }
           }
         end
         logger&.debug(message: 'Fetch relevant DMPs _by_owner - scan args', details: args)
-        resp = client.scan(args)
+        resp = client.scan(args:)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
         _process_search_response(response: client.query(args:, logger:))
@@ -167,7 +167,7 @@ module Uc3DmpId
         ror = org.trim() unless (org.to_s =~ regex).nil?
 
         args = {
-          filter_expression: 'contains(:affiliation_ids, affiliation_ids)',
+          filter_expression: 'contains(:affiliation_ids, affiliation_ids) AND :sk = sk',
           expression_attribute_values: {
             ':sk': 'METADATA',
             ':affiliation_ids': [
@@ -177,7 +177,7 @@ module Uc3DmpId
           }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_org - scan args', details: args)
-        resp = client.scan(args)
+        resp = client.scan(args:)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
         _process_search_response(response: client.query(args:, logger:))
@@ -189,7 +189,7 @@ module Uc3DmpId
         ror = funder.trim() unless (funder.to_s =~ regex).nil?
 
         args = {
-          filter_expression: 'contains(:funder_ids, funder_ids)',
+          filter_expression: 'contains(:funder_ids, funder_ids) AND :sk = sk',
           expression_attribute_values: {
             ':sk': 'METADATA',
             ':funder_ids': [
@@ -199,7 +199,7 @@ module Uc3DmpId
           }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_funder - scan args', details: args)
-        resp = client.scan(args)
+        resp = client.scan(args:)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
         _process_search_response(response: client.query(args:, logger:))
@@ -208,11 +208,11 @@ module Uc3DmpId
       # Fetch the DMP IDs that are marked as featured
       def _by_featured(client: nil, logger: nil)
         args = {
-          filter_expression: ':featured = featured',
+          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)
-        resp = client.scan(args)
+        resp = client.scan(args:)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
         _process_search_response(response: client.query(args:, logger:))
@@ -221,11 +221,11 @@ module Uc3DmpId
       # Return all of the publicly visible DMPs
       def _publicly_visible(client: nil, logger: nil)
         args = {
-          filter_expression: ':visibility = visibility',
+          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)
-        resp = client.scan(args)
+        resp = client.scan(args:)
 
         client = Uc3DmpDynamo::Client.new if client.nil?
         _process_search_response(response: client.query(args:, logger:))

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

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

metadata

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