finapps 5.0.30 → 5.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c74f2340d52ad3cd13dc2bdf8415e7cf89e48f0993dbb346456546910a69ba9
-  data.tar.gz: 3bdefc2032a2efa241d5cc72ab5d6b74fc44b568599f0054bf5477e473fab81f
+  metadata.gz: 9245578f87d01b1010faa9e0f1d426873a24c86f860e83883027b966ba5ac129
+  data.tar.gz: d2b313cbdddb91c8645684727f91b1b7359becbcad1678758a604e43c4e0587c
 SHA512:
-  metadata.gz: 9cb6732ca1b8ba09cc84920ec7fdd086259cd339f012f72cf19c30387f877f3af1aa495bea47f019ee638e9a32eb3f76bbd0397e89b6e773e108da98e9bc8300
-  data.tar.gz: 5dedcdb78fa82b22011520031aae7aa55b1c6e35a7f5ccd55e16fdaa1c6d3b19bd4d17e300a00849d1768be6528b2396adff43ef96b6c6f060740af4315c857f
+  metadata.gz: 46be47b08a87fa355fe54b4db658074496561a6cf0f95c32a239f9b7164159b2aa13ce3a9a8030c5050c30086534212e0d947e88875e686a51edaf197d69c47d
+  data.tar.gz: afa0a48469d1538cc2af130a61d5765c4f7dd3e72c24a2c624a20d28f6436d16074b8e73bb25f68c4751946ea1b062b2438309173857ebbe1a314b18948ff874

data/RELEASES.md

@@ -1,3 +1,12 @@
+## [5.0.31] - 2020-06-11
+
+### Changed
+* Consumer and Doc-order search to query names on spaces ([#224][i224])
+
+[i224]: https://github.com/finapps/ruby-client/issues/224
+
+[5.0.31]: https://github.com/finapps/ruby-client/compare/5.0.30...5.0.31
+
 ## [5.0.30] - 2020-05-28
 
 ### Added

data/lib/finapps/rest/consumers.rb

@@ -54,14 +54,25 @@ module FinApps
       end
 
       def search_query(term)
+        query = with_space_search(term).concat(name_search(term))
         {
-          "$or": [
-            { "email": term },
-            { "first_name": term },
-            { "last_name": term }
-          ]
+          "$or": query
         }
       end
+
+      def with_space_search(term)
+        [
+          { "email": term },
+          { "first_name": term },
+          { "last_name": term }
+        ]
+      end
+
+      def name_search(term)
+        search_arr = []
+        term.split.each { |t| search_arr.append({ "first_name": t }, "last_name": t) } if term.match(/\s/)
+        search_arr
+      end
     end
   end
 end

data/lib/finapps/rest/documents_orders.rb

@@ -51,23 +51,36 @@ module FinApps
 
       def search_query(term)
         if term
+          query = with_space_search(term).concat(name_search(term))
           {
-            "$or": [
-              { "applicant.email": term },
-              { "applicant.first_name": term },
-              { "applicant.last_name": term },
-              {
-                "reference_no": {
-                  "$regex": "^#{term}", "$options": 'i'
-                }
-              }
-            ]
+            "$or": query
           }
         else
           {}
         end
       end
 
+      def name_search(term)
+        search_arr = []
+        if term.match(/\s/)
+          term.split.each { |t| search_arr.append({ "applicant.first_name": t }, "applicant.last_name": t) }
+        end
+        search_arr
+      end
+
+      def with_space_search(term)
+        [
+          { "applicant.email": term },
+          { "applicant.first_name": term },
+          { "applicant.last_name": term },
+          {
+            "reference_no": {
+              "$regex": "^#{term}", "$options": 'i'
+            }
+          }
+        ]
+      end
+
       def tag_query(tag)
         if tag
           { "tag": tag.empty? ? nil : tag }

data/lib/finapps/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FinApps
-  VERSION = '5.0.30'
+  VERSION = '5.0.31'
 end

data/spec/rest/consumers_spec.rb

@@ -110,6 +110,25 @@ RSpec.describe FinApps::REST::Consumers,
             '&sort=date_created'
         expect(WebMock).to have_requested(:get, url)
       end
+
+      context 'when search term contains a space' do
+        let(:params) do
+          {
+            page: 2,
+            sort: 'date_created',
+            requested: 25,
+            searchTerm: 'Two terms'
+          }
+        end
+        it 'treats space as start of a new query for first and last name' do
+          list
+          url = "#{versioned_api_path}/consumers?filter=%7B%22$or%22:%5B%7B%22email%22:%22Two%20terms%22%7D,"\
+              '%7B%22first_name%22:%22Two%20terms%22%7D,%7B%22last_name%22:%22Two%20terms%22%7D,%7B%22first_name%22:'\
+              '%22Two%22%7D,%7B%22last_name%22:%22Two%22%7D,%7B%22first_name%22:%22terms%22%7D,%7B%22last_name%22:'\
+              '%22terms%22%7D%5D%7D&page=2&requested=25&sort=date_created'
+          expect(WebMock).to have_requested(:get, url)
+        end
+      end
     end
   end
 

data/spec/rest/documents_orders_spec.rb

@@ -60,6 +60,21 @@ RSpec.describe FinApps::REST::DocumentsOrders do
 
           expect(WebMock).to have_requested(:get, url)
         end
+
+        context 'with search term containing spaces' do
+          let(:params) { { "searchTerm": 'Blue Jay', "page": 2 } }
+          it 'builds query and sends proper request' do
+            list
+            url =
+              "#{versioned_api_path}/documents/orders?filter=%7B%22$or%22:%5B%7B%22applicant.email%22:"\
+              '%22Blue%20Jay%22%7D,%7B%22applicant.first_name%22:%22Blue%20Jay%22%7D,%7B%22applicant.last_name%22:'\
+              '%22Blue%20Jay%22%7D,%7B%22reference_no%22:%7B%22$regex%22:%22%5EBlue%20Jay%22,%22$options%22:'\
+              '%22i%22%7D%7D,%7B%22applicant.first_name%22:%22Blue%22%7D,%7B%22applicant.last_name%22:%22Blue%22%7D,'\
+              '%7B%22applicant.first_name%22:%22Jay%22%7D,%7B%22applicant.last_name%22:%22Jay%22%7D%5D%7D&page=2'
+
+            expect(WebMock).to have_requested(:get, url)
+          end
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 5.0.30
+  version: 5.0.31
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finapps_core
@@ -468,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: FinApps REST API ruby client.