zuora_api 1.7.46 → 1.7.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f054d8062406905de090c7b6776c14025c5c3c5c35c0e4956d6e31f3a9db0d4b
-  data.tar.gz: be94cd7bd5ffa2c462bd177a7e099efdc495da806bc770a4ca7dfefb1f82b4b6
+  metadata.gz: eed1fa5dc6016e23c11ac0c31424666d506aae217df0dbef2955dc0cae4aa7f5
+  data.tar.gz: 30c162e44cc887d3fde37d7c77313703943bb4ea38d063db3f17d1f83ef215b4
 SHA512:
-  metadata.gz: ab855eef02dcdb0250909817cb08d6f5e6dbb0cafccdeba9189d3b35d4e4097e144ddb55c4a14828b43b57082a3bf3a31e1cd95533d3f259ad61b2f8856296f0
-  data.tar.gz: 65066319073e08211bdb469286d0657a0abf565ff0d8e687b37c0ebbcbcd867d4fa36d66f56e9adfb43ea00016671403522bbd5388f64135de6b7d4e2e1302d9
+  metadata.gz: 29fe139b91d70cd5765a767496ac752212939eec317406a261eabf2967aa682a5eca7bbdfede429190798033a1124ec53c8cf6ae91af60d7347c0e1819eb6066
+  data.tar.gz: 7c08435180b364b41d6861d87b8ca639ee6fd41f6b2deb99fad17ef1416b08fadbcd600957b0ec95abc2e65735a32fd2f7f709158e094a8675d480b8272c8426

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.7.46)
+    zuora_api (1.7.47)
       httparty
       nokogiri
       railties (>= 4.1.0, < 6)

data/lib/zuora_api/exceptions.rb

@@ -45,14 +45,16 @@ module ZuoraAPI
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         
         case message
-        when /Payment status should be Processed. Invalid payment is P-\d*./
+        when /^Payment status should be Processed. Invalid payment is P-\d*./
           @message = "Payment status should be Processed."  
-        when /Adjustment cannot be created for invoice(.*) with a zero balance./
+        when /^Adjustment cannot be created for invoice(.*) with a zero balance./
           @message = "Adjustment cannot be created for invoice with a zero balance."
-        when /The balance of all the invoice items and tax items is 0. No write-off is needed for the invoice .*./
+        when /^The balance of all the invoice items and tax items is 0. No write-off is needed for the invoice .*./
           @message = "The balance of all the invoice items and tax items is 0. No write-off is needed for the invoice."
-        when /Json input does not match schema. Error(s): string ".*" is too long .*/
+        when /^Json input does not match schema. Error(s): string ".*" is too long .*/
           @message = "Json input does not match schema. Error(s): String is too long."
+        when /^Query failed \(.*\): .* Table (.*) does not exist$/
+          @message = "Query failed: Table #{$1} does not exist"
         else
           @message = message  
         end

data/lib/zuora_api/login.rb

@@ -348,7 +348,7 @@ module ZuoraAPI
       return "#{url_slash_apps_slash}api/#{url}"
     end
 
-    def rest_endpoint(url="")
+    def rest_endpoint(url="", domain=true, prefix='/v1/')
       update_environment
       endpoint = url
 
@@ -356,33 +356,33 @@ module ZuoraAPI
       when 'Sandbox'
         case self.region
         when 'US'
-          endpoint = "https://rest.apisandbox.zuora.com/v1/".concat(url)
+          endpoint = "https://rest.apisandbox.zuora.com"
         when 'EU'
-          endpoint = "https://rest.sandbox.eu.zuora.com/v1/".concat(url)
+          endpoint = "https://rest.sandbox.eu.zuora.com"
         when 'NA'
-          endpoint = "https://rest.sandbox.na.zuora.com/v1/".concat(url)
+          endpoint = "https://rest.sandbox.na.zuora.com"
         end
       when 'Production'
         case self.region
         when 'US'
-          endpoint = "https://rest.zuora.com/v1/".concat(url)
+          endpoint = "https://rest.zuora.com"
         when 'EU'
-          endpoint = "https://rest.eu.zuora.com/v1/".concat(url)
+          endpoint = "https://rest.eu.zuora.com"
         when 'NA'
-          endpoint = "https://rest.na.zuora.com/v1/".concat(url)
+          endpoint = "https://rest.na.zuora.com"
         end
       when 'Performance'
-        endpoint = "https://rest.pt1.zuora.com/v1/".concat(url)
+        endpoint = "https://rest.pt1.zuora.com"
       when 'Services'
         https = /https:\/\/|http:\/\//.match(self.url)[0]
         host = self.hostname
-        endpoint = "#{https}rest#{host}/v1/#{url}"
+        endpoint = "#{https}rest#{host}"
       when 'Staging'
-        endpoint = "https://rest-staging2.zuora.com/v1/".concat(url)
+        endpoint = "https://rest-staging2.zuora.com"
       when 'Unknown'
         raise "Environment unknown, returning passed in parameter unaltered"
       end
-      return endpoint
+      return domain ? endpoint.concat(prefix).concat(url) : prefix.concat(url)
     end
 
     def rest_domain
@@ -444,7 +444,6 @@ module ZuoraAPI
       debug: false, 
       zuora_track_id: nil, 
       errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), 
-      soft_errors: [],
       z_session: true, 
       timeout_retry: false, 
       timeout: 120,
@@ -494,7 +493,7 @@ module ZuoraAPI
       output_xml = Nokogiri::XML(response.body)
       Rails.logger.debug("Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
-      raise_errors(type: :SOAP, body: output_xml, response: response, soft_errors: soft_errors)
+      raise_errors(type: :SOAP, body: output_xml, response: response)
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && z_session
         tries -= 1
@@ -571,7 +570,7 @@ module ZuoraAPI
       return output_xml, input_xml, response
     end
 
-    def raise_errors(type: :SOAP, body: nil, response: nil, soft_errors: [])
+    def raise_errors(type: :SOAP, body: nil, response: nil)
       if [502,503].include?(response.code)
         raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{response.request.uri}", response)
       end
@@ -593,11 +592,6 @@ module ZuoraAPI
              '//ns1:records[@xsi:type="ns2:Export"]',
              'ns1' => 'http://api.zuora.com/', 'xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
            ).present?
-          if body.xpath('//ns1:size', 'ns1' => 'http://api.zuora.com/').text.to_i < 1 && soft_errors.include?(:export_size_0)
-            error = 'UNEXPECTED_ERROR'
-            message = 'No export found.'
-          end
-
           result = body.xpath('//ns2:Status', 'ns2' => 'http://object.api.zuora.com/').text
           if result == 'Failed'
             reason = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
@@ -630,6 +624,24 @@ module ZuoraAPI
         end
 
       when :JSON
+        if body.class == Hash
+          request = response.request
+          match_string = "#{request.http_method.to_s.split("Net::HTTP::").last.upcase}::#{response.code}::#{request.path.path}"
+          case response.request.path.path
+          when /^\/query\/jobs.*/  #DataQuery Paths
+            case match_string
+            when /^GET::200::\/query\/jobs\/([a-zA-Z0-9\-_]*)$/ #Get DQ job
+              if (body.dig('data', "errorMessage").present? || body.dig('data', "queryStatus") == "failed") #&& 
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('data', "errorMessage"), response)
+              end
+            when /^GET::404::\/query\/jobs\/([a-zA-Z0-9\-_]*)$/ #Get DQ job not found
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
+            when /^POST::400::\/query\/jobs$/ #Create DQ job
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
+            end
+          end
+        end
+
         body = body.dig("results").present? ? body["results"] : body if body.class == Hash
         if body.class == Hash && (!body["success"] || !body["Success"] || response.code != 200)
           messages_array = body.fetch("reasons", []).map {|error| error['message']}.compact
@@ -684,16 +696,21 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", response)
           end
 
-          #Request exceeded limit
-          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", response)
-          end
-
           #Locking contention
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
             raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", response)
           end
 
+          #Internal Server Error
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(60)
+            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("#{messages_array.join(', ')}", response)
+          end
+
+          #Request exceeded limit
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", response)
+          end
+
           #All Errors catch
           if codes_array.size > 0
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", response)
@@ -705,11 +722,15 @@ module ZuoraAPI
           end
 
           if body["Errors"].present? || body["errors"].present?
-            errors = []
-            (body["Errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
-            (body["errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
-            if errors.size > 0
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", response, errors)
+            codes, messages = [[],[]]
+            body.fetch("Errors", []).select { |obj| messages.push(obj["Message"]); codes.push(obj["Code"]) }
+            body.fetch("errors", []).select { |obj| messages.push(obj["Message"]); codes.push(obj["Code"]) }
+            if codes.size > 0
+              if codes.uniq.size == 1
+                raise_errors_helper(error: codes.first, message: messages.first, response: response, errors: messages)
+              else
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages.join(", ")}", response, messages)
+              end
             end
           end
         end
@@ -817,7 +838,7 @@ module ZuoraAPI
       when /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/, /CANNOT_DELETE/, /ACCOUNTING_PERIOD_CLOSED/
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
       when /.*UNEXPECTED_ERROR/
-        raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(message.to_s, response, errors, success)
+        raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(message, response, errors, success)
       when /.*soapenv:Server.*/
         if /Invalid value.*for type|Id is invalid/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.46"
+  VERSION = "1.7.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.46
+  version: 1.7.47
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler