uc3-dmp-id 0.1.60 → 0.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791179155f0be964f0cfc186f26de88e9f0774ee9ebb671f7856074b1d40639e
-  data.tar.gz: 0bf38f90d0863863362ea4fb5357566d8b262c2036840d78519796e2d55d893a
+  metadata.gz: 289f8d64c3d235bd1dcfa4944f61f9b02df27a10269fe4e488f22e07858ca7a7
+  data.tar.gz: 8cf27583d3ac6dc860b451358d5ddc2c398138106f95829234ade8f075e1bbcf
 SHA512:
-  metadata.gz: e938eb3ddaa088e2cc17bb6a4202de8673c5eeb046c47207e1c040eff8775fdede2b835a90758ab8e892490677b93502c205b0244fae3884299498caf27575a8
-  data.tar.gz: ae45834944f078ab9e0d3fae1c6b32d2f5015c5b74b46c526c62b457b22e329662c6049ba4dd090e67f4c7f4208d9a1f858cb62b4dc52fa8b1e2bc1b4b17f692
+  metadata.gz: 0e37a65b597ce40874d7380ca16af810eb0a87a21251cbf9edd1b770cfa64d7fee113746669899879aaa9bd55abdbc91e5cfdde8ceabab73c4939193dbfcd9e1
+  data.tar.gz: 12f88664290e9d479c099d3fa28a1657182b40146dbb1cb4c55f28b0f44102d962ad0f11e1d30767b160dbfd502af0e24ee03ec54d1af484191f5853e500927f

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

@@ -19,28 +19,34 @@ module Uc3DmpId
 
     ORCID_DOMAIN = 'https://orcid.org/'
     ROR_DOMAIN = 'https://ror.org/'
+    SORT_OPTIONS = %w[title modified]
+    SORT_DIRECTIONS = %w[asc desc]
+    MAX_PAGE_SIZE = 100
+    DEFAULT_PAGE_SIZE = 25
+    DEFAULT_SORT_OPTION = 'modified'
+    DEFAULT_SORT_DIR = 'desc'
 
     class << self
       # TODO: Replace this with ElasticSearch
       def search_dmps(args:, logger: nil)
         # Fetch the DMPs for each of the possible filter options
         client = Uc3DmpDynamo::Client.new(table: ENV['DYNAMO_INDEX_TABLE'])
-        owner_pks = _by_owner(owner: args['owner'], client:, logger:) unless args['owner'].nil?
-        org_pks = _by_org(org: args['org'], client:, logger:) unless args['org'].nil?
-        funder_pks = _by_funder(funder: args['funder'], client:, logger:) unless args['funder'].nil?
+        owner = args['owner']
+        org = args['org']
+        funder = args['funder']
+
+        owner_pks = owner.nil? ? [] : _by_owner(owner: owner, client:, logger:)
+        org_pks = org.nil? ? [] : _by_org(org: org, client:, logger:)
+        funder_pks = funder.nil? ? [] : _by_funder(funder: funder, client:, logger:)
+        pks = [owner_pks, org_pks, funder_pks].reject(&:empty?)
         return [] if owner_pks.empty? && org_pks.empty? && funder_pks.empty?
 
         # Only use the DMPs that fit all of the filter criteria
-        dmps = owner_pks & org_pks & funder_pks
+        dmps = pks.reduce(:&).flatten.uniq
         return [] if dmps.nil? || dmps.empty?
 
-        # Perfom search operations
 
-        # Handle sort
-
-        # Handle pagination
-
-        # Fetch full DMP records
+        # Fetch full DMP records for the results
         client = Uc3DmpDynamo::Client.new(table: ENV['DYNAMO_TABLE'])
         _fetch_dmps(client:, pks: dmps.map { |dmp| dmp['pk'] }, logger:)
       end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.60
+  version: 0.1.62
 platform: ruby
 authors:
 - Brian Riley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json