uc3-dmp-id 0.1.53 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed8f25c716416ba94aa70e864f64a84451346291667acaf491a5efd755e7abd
-  data.tar.gz: d64e0d33da594f81ac90624740e4d80a5309c112f9d2c8bcbeae5f4b60386edf
+  metadata.gz: 303302842851603259f0981187aa9e2df87db1214541f8716686ee0f68c3d565
+  data.tar.gz: de9174608180b81de434d1f5d87abfa1f339c14495d49f93f0c7446cdaaea608
 SHA512:
-  metadata.gz: 75de41d469fed8bfc95d2b81dc2b784bca641c3ec986f03d772d060e72a99a7a05d8633b19aff24dcf00099ca8ab769218cab3b9036ad4663f7769db7f76c8fc
-  data.tar.gz: c83a34001e05eaae3dd7aa21e11a8566846524b4e24d9bd499bdbd2ad3db43271304613f56515ae2ed28a04418b57a430af8aed29b552c6d3496d84c3e1c1acb
+  metadata.gz: 654b37d44b2b871a385dd72f3104ba857e01b2fff58690708aea9beb3f2e2480eb6550bb18dc3b21cd67ea1362c805dd456bbea4da89598a50493499d934719a
+  data.tar.gz: bff8736d8b88b890497c13f4604dd67749bf6409045de1532debd4875f7edb7baedb4ca427d5d9a02c2baea452a603ebcc6c98652e9a33f7a9d8217a8190cb4d

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,15 +150,13 @@ 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:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Fetch the DMP IDs for the specified organization/institution
@@ -167,7 +165,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,10 +175,8 @@ module Uc3DmpId
           }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_org - scan args', details: args)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Fetch the DMP IDs for the specified funder
@@ -189,7 +185,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,36 +195,30 @@ module Uc3DmpId
           }
         }
         logger&.debug(message: 'Fetch relevant DMPs _by_funder - scan args', details: args)
-        resp = client.scan(args:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # 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:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # 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:)
-
         client = Uc3DmpDynamo::Client.new if client.nil?
-        _process_search_response(response: client.query(args:, logger:))
+        _process_search_response(response: client.scan(args:))
       end
 
       # Transform the search results so that we do not include any of the DMPHub specific metadata

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

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

metadata

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