zuora_connect 1.4.26 → 1.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b356489aebd9c60f8b1b1d54e86e7ea380a2e9d2
-  data.tar.gz: 02f6d6b3d0876c52c78ca5cd3715789c54674f16
+  metadata.gz: 68db8fc7b5747a7f48f637fa7617c9236fe855e3
+  data.tar.gz: 6e0f26cb0c70fa8c644b2feea037006e55790958
 SHA512:
-  metadata.gz: b8dca78b0be9a12bc11b9add0d56405d7dde07c33132fba33471e68cf21aa3aedb0781de6b7dbeb3a02294d8f8d48b7dafae1ba4fd73ab3e0e1459128f4deaad
-  data.tar.gz: 05855826e0c9c3a7dad5b52b590b66089f8361c85ac9a6c55087db61f1d3800916f70a005e4630d4c8ce8ac79704acd653ab6ab24ec7d762f24438726b8bb020
+  metadata.gz: 6ae942f39bf835b60bbc18f7ebba849786af486196a4a01c76bc91c95b2cbd356911348b92e6839a6c359bb89ea270555b9bf2d89df7ecd544a9a63e9a98292f
+  data.tar.gz: d5887de872edffc73cb60b1c43e42bfff6e9d59560010d7b7bb8fdf6194dd8000ea2b6f60e511a1914581a85cb826d5d5dc3c3b1b8dcf6329bf642c3fa3bf0eb

data/app/models/zuora_connect/app_instance_base.rb

@@ -56,12 +56,12 @@ module ZuoraConnect
     # entity_id: If the using catalog json be field to store multiple entity product catalogs.
     # object: The Object class desired to be returned. Available [:product, :rateplan, :charge]
     # object_id: The id or id's of the object/objects to be returned.
-    # child_objects: Whether to include child objects of the object in question. 
+    # child_objects: Whether to include child objects of the object in question.
     # cache: Store individual "1" object lookup in redis for caching.
     def catalog_lookup(entity_id: nil, object: :product, object_id: nil, child_objects: false, cache: false)
       entity_reference = entity_id.blank? ? 'Default' : entity_id
 
-      if object_id.present? && ![Array, String].include?(object_id.class) 
+      if object_id.present? && ![Array, String].include?(object_id.class)
         raise "Object Id can only be a string or an array of strings"
       end
 
@@ -77,17 +77,17 @@ module ZuoraConnect
       case object
       when :product
         if object_id.blank?
-          string = 
+          string =
             "SELECT "\
               "json_object_agg(product_id, product #{child_objects ? '' : '- \'productRatePlans\''}) AS item "\
             "FROM "\
               "\"public\".\"zuora_connect_app_instances\", "\
               "jsonb_each((\"public\".\"zuora_connect_app_instances\".\"catalog\" #> '{%s}' )) AS e(product_id, product) "\
             "WHERE "\
-              "\"id\" = %s" % [entity_reference, self.id]          
+              "\"id\" = %s" % [entity_reference, self.id]
         else
           if object_id.class == String
-            string = 
+            string =
               "SELECT "\
                 "(catalog #> '{%s, %s}') #{child_objects ? '' : '- \'productRatePlans\''} AS item "\
               "FROM "\
@@ -95,7 +95,7 @@ module ZuoraConnect
               "WHERE "\
                 "\"id\" = %s" % [entity_reference, object_id, self.id]
           elsif object_id.class == Array
-            string = 
+            string =
               "SELECT "\
                 "json_object_agg(product_id, product #{child_objects ? '' : '- \'productRatePlans\''}) AS item "\
               "FROM "\
@@ -120,7 +120,7 @@ module ZuoraConnect
               "\"id\" = %s" % [entity_reference, self.id]
         else
           if object_id.class == String
-            string = 
+            string =
               "SELECT "\
                 "(catalog #> '{%s, %s, productRatePlans, %s}') #{child_objects ? '' : '- \'productRatePlanCharges\''} AS item "\
               "FROM "\
@@ -128,7 +128,7 @@ module ZuoraConnect
               "WHERE "\
                 "\"id\" = %s" % [entity_reference, object_hierarchy['productId'], object_id,  self.id]
           elsif object_id.class == Array
-            string = 
+            string =
               "SELECT "\
                 "json_object_agg(rateplan_id, rateplan #{child_objects ? '' : '- \'productRatePlanCharges\''}) AS item "\
               "FROM "\
@@ -155,7 +155,7 @@ module ZuoraConnect
               "\"id\" = %s" % [entity_reference, self.id]
         else
           if object_id.class == String
-            string = 
+            string =
               "SELECT "\
                 "catalog #> '{%s, %s, productRatePlans, %s, productRatePlanCharges, %s}' AS item "\
               "FROM "\
@@ -164,7 +164,7 @@ module ZuoraConnect
                 "\"id\" = %s" % [entity_reference, object_hierarchy['productId'], object_hierarchy['productRatePlanId'], object_id, self.id]
 
           elsif object_id.class == Array
-            string = 
+            string =
               "SELECT "\
                 "json_object_agg(charge_id, charge) AS item "\
               "FROM "\
@@ -183,11 +183,11 @@ module ZuoraConnect
 
       stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute(string).first["item"] || "{}")
 
-      if defined?(Redis.current) && object_id.present? && object_id.class == String 
+      if defined?(Redis.current) && object_id.present? && object_id.class == String
         Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(object_hierarchy))
-        Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(stub_catalog))  if cache 
+        Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(stub_catalog))  if cache
       end
-   
+
       return stub_catalog
     end
 
@@ -208,13 +208,13 @@ module ZuoraConnect
       Rails.logger.debug("Fetching catalog for default") if entity_id.blank?
       Rails.logger.debug("Fetching catalog for entity #{entity_id}") if !entity_id.blank?
       Rails.logger.debug("Fetch Catalog")
-    
+
       login = zuora_login.client(entity_reference)
 
       old_logger = ActiveRecord::Base.logger
       ActiveRecord::Base.logger = nil
       ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{tmp}\', \'{}\'), "catalog_mapping" = jsonb_set("catalog_mapping", \'{tmp}\', \'{}\') where "id" = %{id}' % {:id => self.id})
-     
+
       response = {'nextPage' => login.rest_endpoint("catalog/products?pageSize=#{page_size}")}
       while !response["nextPage"].blank?
         url = login.rest_endpoint(response["nextPage"].split('/v1/').last)
@@ -410,6 +410,7 @@ module ZuoraConnect
     end
 
     def refresh_oauth
+      count ||= 0
       Rails.logger.debug("[#{self.id}] REFRESHING - OAuth")
       params = {
                 :grant_type => "refresh_token",
@@ -426,6 +427,15 @@ module ZuoraConnect
       else
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
       end
+    rescue
+      if count < 3
+        Rails.logger.debug("REFRESHING - OAuth Failed - Retrying(#{count})")
+        count += 1
+        retry
+      else
+        Rails.logger.fatal("REFRESHING - OAuth Failed")
+        raise
+      end
     end
 
     def oauth_expired?

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.26"
+  VERSION = "1.4.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.26
+  version: 1.4.27
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store