finapps 5.0.23 → 5.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a680cc81ef178bcca5fa52772b2c0630802442a0e320c3557e3153f3643d18b
-  data.tar.gz: a8f4a002fb6368f40c71afc3e6d7a677bdbf17f3eee1dc5422767b16baff3aee
+  metadata.gz: f21200338d07c1ab7882266ee53bb695bcd2214fd54c3dd8bd1e4f54f07003fd
+  data.tar.gz: 95168dfe1ade82536cd5ccb0a967a451cfabc6c3323796955e97f821c81c03ac
 SHA512:
-  metadata.gz: 8438628a45e0b2c399754888eee305bb1e5d5757f43d0ca57f9d095558a178d7c24b455ea4e1f6f2b746d6f69bcc29eebf9deac8c68f3dc63c6520781013280c
-  data.tar.gz: 2b462e0519e8f2eef0826d4af2898b58da073f7b9212be0393a5676f2c20e5e67f5ce595be15d5c3234611534c546d454cf42ab7eb3fe054ee59534522590378
+  metadata.gz: bd3183fe7bad50f52717109c80b14766a642d895d8d3fc30bce7171428324cb372258b31d5d70f14fe0f492875109b6b415dbf2008d6fe3c05e59e93e98ee2b3
+  data.tar.gz: c3a257358611b37562c7d34559bd69b574fdd590a7576c82cb8fa569b298bc2b907bee86a447c052f15c59480c74df81663e033c9833601be018f196fac387c2

data/lib/finapps/rest/orders.rb

@@ -56,48 +56,71 @@ module FinApps
       private
 
       def build_filter(params)
-        filter = {}
-        filter.merge!(search_query(params[:searchTerm])) if params[:searchTerm]
-        filter.merge!(status_query(params[:status])) if params[:status]
-        filter.merge!(assignment_query(params[:assignment])) if params[:assignment] # assignment can be ""
-        filter.merge!(relation_query(params[:relation])) if !params[:searchTerm] && !nil_or_empty?(params[:relation])
-        filter
+        search_query(params[:searchTerm]).merge(status_query(params[:status]))
+                                         .merge(assignment_query(params[:assignment]))
+                                         .merge(consumer_query(params[:consumer]))
+                                         .merge(relation_query(params[:relation], params[:searchTerm]))
       end
 
       def search_query(term)
-        {
-          "$or": [
-            { "public_id": { "$regex": "^#{term}", "$options": 'i' } },
-            { "applicant.last_name": term },
-            { "assignment.last_name": term },
-            {
-              "requestor.reference_no": {
-                "$regex": "^#{term}", "$options": 'i'
+        if term
+          {
+            "$or": [
+              { "public_id": { "$regex": "^#{term}", "$options": 'i' } },
+              { "applicant.last_name": term },
+              { "assignment.last_name": term },
+              {
+                "requestor.reference_no": {
+                  "$regex": "^#{term}", "$options": 'i'
+                }
               }
-            }
-          ]
-        }
+            ]
+          }
+        else
+          {}
+        end
       end
 
       def status_query(status)
-        if status.is_a?(Array)
-          { "status": { "$in": status.map(&:to_i) } }
+        if status
+          if status.is_a?(Array)
+            { "status": { "$in": status.map(&:to_i) } }
+          else
+            { "status": status.to_i }
+          end
         else
-          { "status": status.to_i }
+          {}
         end
       end
 
       def assignment_query(assignment)
-        { "assignment.operator_id": assignment.empty? ? nil : assignment } # translate "" to null assignment
+        # translate "" to null assignment
+        if assignment
+          { "assignment.operator_id": assignment.empty? ? nil : assignment }
+        else
+          {}
+        end
+      end
+
+      def consumer_query(consumer)
+        if consumer
+          { "consumer_id": consumer.empty? ? nil : consumer }
+        else
+          {}
+        end
       end
 
-      def relation_query(relation)
-        {
-          "$or": [
-            { "public_id": { "$in": relation } },
-            { "original_order_id": { "$in": relation } }
-          ]
-        }
+      def relation_query(relation, search_term)
+        if !search_term && !nil_or_empty?(relation)
+          {
+            "$or": [
+              { "public_id": { "$in": relation } },
+              { "original_order_id": { "$in": relation } }
+            ]
+          }
+        else
+          {}
+        end
       end
     end
   end

data/lib/finapps/version.rb

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

data/spec/rest/orders_spec.rb

@@ -102,6 +102,7 @@ RSpec.describe FinApps::REST::Orders do
           searchTerm: 'term',
           status: %w[1 7],
           assignment: 'valid_operator',
+          consumer: 'valid_consumer_id',
           relation: %w[valid_order_id]
         }
       end
@@ -121,20 +122,21 @@ RSpec.describe FinApps::REST::Orders do
         subject
         url =
           "#{versioned_api_path}/orders?filter=%7B%22$or%22:%5B%7B%22public_id%22:" \
-            '%7B%22$regex%22:%22%5Eterm%22,%22$options%22:%22i%22%7D%7D,%7B%22applicant.last_name%22:%22term%22%7D' \
-            ',%7B%22assignment.last_name%22:%22term%22%7D,%7B%22requestor.reference_no%22:%7B%22$regex%22:%22%5E' \
-            'term%22,%22$options%22:%22i%22%7D%7D%5D,%22status%22:%7B%22$in%22:%5B1,7%5D%7D,%22assignment.' \
-            'operator_id%22:%22valid_operator%22%7D&page=2&requested=25&sort=status'
+            '%7B%22$regex%22:%22%5Eterm%22,%22$options%22:%22i%22%7D%7D,%7B%22applicant.last_name%22:%22' \
+            'term%22%7D,%7B%22assignment.last_name%22:%22term%22%7D,%7B%22requestor.reference_no%22:%7B%22' \
+            '$regex%22:%22%5Eterm%22,%22$options%22:%22i%22%7D%7D%5D,%22status%22:%7B%22$in%22:%5B1,7%5D%7D,' \
+            '%22assignment.operator_id%22:%22valid_operator%22,%22consumer_id%22:%22valid_consumer_id%22%7D' \
+            '&page=2&requested=25&sort=status'
         expect(WebMock).to have_requested(:get, url)
       end
       it 'builds query and sends proper request with searchTerm/relation exclusivity' do
         params[:searchTerm] = nil
         subject
         url =
-          "#{versioned_api_path}/orders?filter=%7B%22status%22:%7B%22$in%22:%5B1," \
-            '7%5D%7D,%22assignment.operator_id%22:%22valid_operator%22,%22$or%22:%5B%7B%22public_id%22:%7B%22$in' \
-            '%22:%5B%22valid_order_id%22%5D%7D%7D,%7B%22original_order_id%22:%7B%22$in%22:%5B%22valid_order_id%22' \
-            '%5D%7D%7D%5D%7D&page=2&requested=25&sort=status'
+          "#{versioned_api_path}/orders?filter=%7B%22status%22:%7B%22$in%22:%5B1,7%5D%7D," \
+          '%22assignment.operator_id%22:%22valid_operator%22,%22consumer_id%22:%22valid_consumer_id%22,' \
+          '%22$or%22:%5B%7B%22public_id%22:%7B%22$in%22:%5B%22valid_order_id%22%5D%7D%7D,%7B%22original_order_id%22:' \
+          '%7B%22$in%22:%5B%22valid_order_id%22%5D%7D%7D%5D%7D&page=2&requested=25&sort=status'
         expect(WebMock).to have_requested(:get, url)
       end
       it 'builds null assignment query properly when supplied w/ empty string' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 5.0.23
+  version: 5.0.24
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finapps_core