zuora_api 1.7.24 → 1.7.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0de5586adb994227f6e5db5a36a279d237cf4593a5c906860a68f6ccb5277f
-  data.tar.gz: 78fdc0b33ca7ea01adce4f9b961d05373515e8916d57b234d86f5c282b3eb3b5
+  metadata.gz: 3a1994319f46f6759b6749f7f6f40909c4a485029a3500ddd673f7937e2aae16
+  data.tar.gz: a04062860cd33c0c3e7e3fe2fc5dc0c44a5fe3d61807d747935da571e9713d96
 SHA512:
-  metadata.gz: 2ec0189a886862677f06f1d1b4fbea980c19cd2925f314dc7d3def14e51cab77e51e2fb6e71edd9aaea2f86efba21454a86d6abb11c0001881068dec493dbb09
-  data.tar.gz: afb08de9fdedf6764bac554a2c1b4ddeabf4bfb794e59481a590c05fbf9a9bf985b5f5fb22a957b148016d3138769732301d9740fc4d250af7d3a745b8ed09e8
+  metadata.gz: 25cd0027b6ae0ab062d709e4352e7cf9e36ecdb0dc91e4a759a33bdb753aa5ee9826d6bc640d35bd320a017f09900fdea995a491bed05fa0dfd959ca36cbbca3
+  data.tar.gz: fcbd9b0b32c118e91084f4b279f9451dfd702d6f4410234d995801b3100a7dd23be067460794e4c87f729ee56043a6ca02943ee8c9606d6cb61cada83b68da4e

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea

data/lib/zuora_api/exceptions.rb

@@ -7,7 +7,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil)
+      def initialize(message = nil,response=nil, errors = [], successes = [])
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -77,7 +77,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -89,11 +89,27 @@ module ZuoraAPI
       end
     end
 
+    class ZuoraAPIUnkownError < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = message
+        @response = response
+        @default_message = "An unkown error occured. Workflow is not responsible. Please contact Support."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
     class ZuoraAPILockCompetition < Error
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -109,7 +125,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -125,7 +141,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil, response=nil, *args)
+      def initialize(message = nil, response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -141,7 +157,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -157,7 +173,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -173,7 +189,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
@@ -189,7 +205,7 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
         @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response

data/lib/zuora_api/login.rb

@@ -32,7 +32,8 @@ module ZuoraAPI
       ZuoraAPI::Exceptions::ZuoraAPITemporaryError,
       ZuoraAPI::Exceptions::ZuoraDataIntegrity,
       ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-      ZuoraAPI::Exceptions::ZuoraUnexpectedError
+      ZuoraAPI::Exceptions::ZuoraUnexpectedError,
+      ZuoraAPI::Exceptions::ZuoraAPIUnkownError
     ].freeze
     
     attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
@@ -531,73 +532,24 @@ module ZuoraAPI
 
       case type
       when :SOAP
-        error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
-        message = body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
-
-        if error.blank? || message.blank?
-          error   = body.xpath('//faultcode').text
-          message = body.xpath('//faultstring').text
-        end
-
-        if error.blank? || message.blank?
-          error   = body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text
-          message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text
-        end
-
-        #Update/Create/Delete Calls with multiple requests and responses
-        if body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').size > 0 && body.xpath('//ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
-          error = []
-          success = []
-          body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').each_with_index do |call, object_index|
-            if call.xpath('./ns1:Success', 'ns1' =>'http://api.zuora.com/').text == 'false' && call.xpath('./ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
-              message = "#{call.xpath('./*/ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{call.xpath('./*/ns1:Message', 'ns1' =>'http://api.zuora.com/').text}"
-              error.push(message)
-            else
-              success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
-            end
-          end
-        end
+        error, success, message = get_soap_error_and_message(body)
 
         #By default response if not passed in for SOAP as all SOAP is 200
         if error.present?
           if error.class == String
-            case error
-            when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", response)
-            when "REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", response)
-            when "LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response)
-            when "BATCH_FAIL_ERROR"
-              if message.include?("optimistic locking failed")
-                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response) 
-              else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
-              end
-            when "TEMPORARY_ERROR"
-              raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", response)
-            when "INVALID_VALUE"
-              if message.include?("data integrity violation")
-                raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response)
-              else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
-              end
-            else
-              if response.code == 500
-                raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new('Zuora API Internal Server Error', response)
-              else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response) if error.present?
-              end
-            end
+            raise_errors_helper(error, message, response)
           elsif error.class == Array
+
             if error[0].include?("LOCK_COMPETITION") && error.count == 1
               raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response)
+            end
+
+            if error.uniq.size == 1
+              err, msg = error[0].split('::')
+              err = "(#{error.size}x) - #{err}"
+              raise_errors_helper(err, msg, response, error, success)
             else
-              if response.code == 500
-                raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new('Zuora API Internal Server Error', response)
-              else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response, error, success)
-              end
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response, error, success)
             end
           end
         elsif response.code == 500
@@ -722,6 +674,75 @@ module ZuoraAPI
       end
     end
 
+    def get_soap_error_and_message(body)
+      error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
+      message = body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
+
+      if error.blank? || message.blank?
+        error   = body.xpath('//faultcode').text
+        message = body.xpath('//faultstring').text
+      end
+
+      if error.blank? || message.blank?
+        error   = body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text
+        message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text
+      end
+
+      #Update/Create/Delete Calls with multiple requests and responses
+      if body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').size > 0 && body.xpath('//ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
+        error = []
+        success = []
+        body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').each_with_index do |call, object_index|
+          if call.xpath('./ns1:Success', 'ns1' =>'http://api.zuora.com/').text == 'false' && call.xpath('./ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
+            message = "#{call.xpath('./*/ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{call.xpath('./*/ns1:Message', 'ns1' =>'http://api.zuora.com/').text}"
+            error.push(message)
+          else
+            success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
+          end
+        end
+      end
+      return error, success, message
+    end
+
+    def raise_errors_helper(error, message, response, errors = [], success = [])
+      case error
+      when /.*INVALID_SESSION/
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", response, errors, success)
+      when /.*REQUEST_EXCEEDED_LIMIT/
+        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", response, errors, success)
+      when /.*LOCK_COMPETITION/
+        raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response, errors, success)
+      when /.*BATCH_FAIL_ERROR/
+        if message.include?("optimistic locking failed")
+          raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response, errors, success)
+        else
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response, errors, success)
+        end
+      when /.*TEMPORARY_ERROR/
+        raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", response, errors, success)
+      when /.*INVALID_VALUE/
+        if message.include?("data integrity violation")
+          raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response, errors), success
+        else
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response, errors, success)
+        end
+      when /.*UNKNOWN_ERROR/
+        raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new("#{error}::#{message}", response, errors, success)
+      when /.*soapenv:Server.*/
+        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new('Zuora API Internal Server Error', response, errors, success)
+      else
+        if response.code == 500
+          if message.present?
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response, errors, success)
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new('Zuora API Internal Server Error', response, errors, success)
+          end
+        else
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response, errors, success) if error.present?
+        end
+      end
+    end
+
     def aqua_query(queryName: '', query: '', version: '1.2', jobName: 'Aqua',partner: '', project: '')
       params = {
         "format" => 'csv',

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.24"
+  VERSION = "1.7.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.24
+  version: 1.7.25
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group