zuora_api 1.7.48 → 1.7.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d42d8b994883bc0b9c7dce96886b9cf73c36d38588d966b90a11db463c6a5b9
-  data.tar.gz: 365ba88fcf1624b2f25785cd8550a90d6d75633514665b8438bca87bb118be7c
+  metadata.gz: ae66e3f70b9d98bc1ad9b8d6bd08c3ac43bea36234db0af1efe428a129614fee
+  data.tar.gz: 812c7ab8f8133b8754ff7646169e3466b907099f707d394b9d6ea54e2073db66
 SHA512:
-  metadata.gz: ab039d7a51f44a1cea743c3071b135e6a62a2c27df60a7777d248872637f32d14eb927b4af75bf0edcdabd97726558a3a950fc2aa406e299f2f28ea940c74c0d
-  data.tar.gz: 163c586e8c33b6ea7b4e3d413979b005b5531b5091f7226ddbd5896eceedf4d8519e58cf6e048ad2c1b913e9838fbe86e4be8b44195ca0ce23838a3b441e72ef
+  metadata.gz: 2981b12a15b6195df7115f769ffb71ebe4a84e5af2d305ab8396b0d497088054dec8be21cb1ae7bc51f731ea6856edcaef83caa3cdc804d9d74f1a8ff1295b74
+  data.tar.gz: 85a4af2320a8f70115b35ab322fa844c0d72ac97c603339b598086c6c2f088ceebf8276157f08a7efc1511e03a083a129df128ed1994566f03133bacd2266ef7

data/lib/zuora_api/exceptions.rb

@@ -1,6 +1,25 @@
 module ZuoraAPI
   module Exceptions
-    class Error < StandardError; end
+    class Error < StandardError; 
+      def parse_message(message)
+        case message
+        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./
+          @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 .*./
+          @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 .*/
+          @message = "Json input does not match schema. Error(s): String is too long."
+        when /^Query failed.*: (.*)$/
+          @message = "Query failed: #{$1}"
+        when /^Query failed .*: .*:(.*)$/
+          @message = "Query failed: #{$1}"
+        else
+          @message = message  
+        end
+      end
+    end
     class FileDownloadError < StandardError; end
     class AuthorizationNotPerformed < Error; end
     class ZuoraAPISessionError < Error
@@ -9,7 +28,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [])
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Error with Zuora Session."
       end
@@ -25,7 +44,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [],  *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Error with Zuora Entity"
         @errors = errors
@@ -43,22 +62,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [],  *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        
-        case message
-        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./
-          @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 .*./
-          @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 .*/
-          @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
-        
+        @message = parse_message(message)
         @response = response
         @default_message = "Error communicating with Zuora."
         @errors = errors
@@ -76,7 +80,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response = nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Zuora Internal Server Error."
         @errors = errors
@@ -94,7 +98,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Your request limit has been exceeded for zuora."
       end
@@ -110,7 +114,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "An unkown error occured. Workflow is not responsible. Please contact Support."
       end
@@ -126,7 +130,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Operation failed due to lock competition. Please retry"
       end
@@ -142,7 +146,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Operation failed due to lock competition. Please retry"
       end
@@ -158,7 +162,7 @@ module ZuoraAPI
 
       def initialize(message = nil, response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "An unexpected error occurred"
       end
@@ -174,7 +178,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "There is a temporary error with zuora system."
       end
@@ -190,7 +194,7 @@ module ZuoraAPI
 
       def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @message = parse_message(message)
         @response = response
         @default_message = "Authentication type is not supported by this Login"
       end

data/lib/zuora_api/login.rb

@@ -631,7 +631,9 @@ module ZuoraAPI
           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") #&& 
+              if body.dig('data', "errorCode") == "LINK_10000005"
+                raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(body.dig('data', "errorMessage"), response)
+              elsif (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
@@ -703,6 +705,11 @@ module ZuoraAPI
 
           #Internal Server Error
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(60)
+            if messages_array.uniq.size == 1 
+              if messages_array.first.match(/^There is an invoice pending tax.*|^The Zuora GetTax call to Avalara.*|^The tax calculation call to Zuora Connect returned the following error: Status Code: 4.*/)
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new(messages_array.first, response)
+              end
+            end
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("#{messages_array.join(', ')}", response)
           end
 
@@ -723,10 +730,11 @@ module ZuoraAPI
 
           if body["Errors"].present? || body["errors"].present?
             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"]) }
+            body.fetch("Errors", []).each { |obj| messages.push(obj["Message"]); messages.push(obj["title"]); codes.push(obj["Code"]); codes.push(obj["code"]) }
+            body.fetch("errors", []).each { |obj| messages.push(obj["Message"]); messages.push(obj["title"]); codes.push(obj["Code"]); codes.push(obj["code"]) }
+            codes, messages = [codes.uniq.compact, messages.uniq.compact]
             if codes.size > 0
-              if codes.uniq.size == 1
+              if codes.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)
@@ -823,7 +831,7 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      when /.*TEMPORARY_ERROR/
+      when /.*TEMPORARY_ERROR/, /.*TRANSACTION_TIMEOUT/
         raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(message, response, errors, success)
       when /.*INVALID_VALUE/
         if message.include?("data integrity violation")
@@ -835,12 +843,12 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      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/
+      when /invalid/, /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, response, errors, success)
       when /.*soapenv:Server.*/
-        if /Invalid value.*for type|Id is invalid/.match(message).present?
+        if /^Invalid value.*for type.*|^Id is invalid/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)

data/lib/zuora_api/logins/basic.rb

@@ -100,10 +100,15 @@ module ZuoraAPI
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !tries.zero?
         tries -= 1
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
         retry
       else
+        if Rails.logger.class.to_s == "Ougai::Logger"
+          Rails.logger.error("BasicLogin - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+        else
+          Rails.logger.error("BasicLogin - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+        end
+
         self.current_error = "Request timed out. Try again"
         self.status = 'Timeout'
         return self.status

data/lib/zuora_api/logins/oauth.rb

@@ -62,10 +62,14 @@ module ZuoraAPI
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !tries.zero?
         tries -= 1
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
         retry
       else
+        if Rails.logger.class.to_s == "Ougai::Logger"
+          Rails.logger.error("OAuthLogin - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+        else
+          Rails.logger.error("OAuthLogin - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+        end
         self.current_error = "Request timed out. Try again"
         self.status = 'Timeout'
         return self.status
@@ -120,10 +124,14 @@ module ZuoraAPI
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !tries.zero?
         tries -= 1
-        Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
         retry
       else
+        if Rails.logger.class.to_s == "Ougai::Logger"
+          Rails.logger.error("OAuthLogin - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+        else
+          Rails.logger.error("OAuthLogin - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+        end
         self.current_error = "Invalid login, please check client ID and Client Secret or URL endpoint"
         self.status = 'Timeout'
         return self.status

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.48"
+  VERSION = "1.7.49"
 end

metadata

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