finapps 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466bc237a6a77b4f9021545c74a398c3665a18b3
-  data.tar.gz: 42e49b85f895de09e7892a59e0aad5320ffcd63c
+  metadata.gz: 6193020d474b6c3868abc58a633736652f2bface
+  data.tar.gz: 8fec9d538fc88e8706a27f6a6eb009a45e0d2368
 SHA512:
-  metadata.gz: 9cd1afd63950ac89df8c4110494809b1816812c8a4191d410efc93fb9e0c8f0a562ca89b184118d00c8ecf0afe61a3ee41e5cc23861ae6295aa8467c5728640d
-  data.tar.gz: f37cadd33797e2c95e76ccfc628891e4560232ea304712b0ef26c393b410caab57b563dd6b81b8413d617c17c89c301ba735014c8881d004cab434f41b8e8adb
+  metadata.gz: f39b661759572f31166f54ca5839eef3260b0b426ab0db32422f310632508b65ed57e35a247397dc0bc7307601cf88cae72be7d1b36b0f6467299420cf454c2d
+  data.tar.gz: 785951c200e8749f45c42a91754849d7cc5533d6b6598a70823fcf18d6dcb5ea7c8b272f091c6ae75d8ee404dac668c039781938637ed98d6236a433c83ecefc

data/lib/finapps/rest/orders.rb

@@ -56,6 +56,7 @@ module FinApps
         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.key?(:assignment) # assignment can be nil
+        filter.merge!(relation_query(params[:relation])) if !params[:searchTerm] && !nil_or_empty?(params[:relation])
         filter
       end
 
@@ -92,6 +93,15 @@ module FinApps
       def assignment_query(assignment)
         {"assignment.operator_id": assignment}
       end
+
+      def relation_query(relation)
+        {
+          "$or": [
+            {"public_id": {"$in": relation}},
+            {"original_order_id": {"$in": relation}}
+          ]
+        }
+      end
     end
   end
 end

data/lib/finapps/version.rb

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

data/spec/rest/orders_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe FinApps::REST::Orders do
       subject { FinApps::REST::Orders.new(client).list(params) }
       let(:params) do
         {page: 2, sort: 'status', requested: 25, searchTerm: 'term', status: %w(1 7),
-         assignment: 'valid_operator'}
+         assignment: 'valid_operator', relation: ['valid_order_id']}
       end
 
       it { expect { subject }.not_to raise_error }
@@ -96,6 +96,15 @@ RSpec.describe FinApps::REST::Orders do
               'valid_operator%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 = "#{FinAppsCore::REST::Defaults::DEFAULTS[:host]}/v2/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'
+        expect(WebMock).to have_requested(:get, url)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Erich Quintero