zuora_connect 2.0.60p → 2.0.60q

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49954ce1a10057c773fa3dbc859cccd19e756297192ee85d276cada97c085446
-  data.tar.gz: bd0ce83a9631479cb2402383c5a53e104742d19fb83b951d24cdf5fe66b48bfb
+  metadata.gz: 3a9478b4c078e02402f100894a54bac2b08c1a89465e83ec55cb9f1bbe3f5dff
+  data.tar.gz: e0d5c40113abe3b72ef867ca59f620ce19dc1dee778a7e4e531aedae68a6812c
 SHA512:
-  metadata.gz: d1e341cea3b729c967af29ecfaa9bd143ef656a415487654ae59870ef75e3b719d4873975aa12fe6b845b3916d8ef1de2f63faca22c42c89280058d404c8d3b7
-  data.tar.gz: 22804e4a0db2285d91ef7c1da8fab9d67261ff13302b48db31f872c820d3b037425ece070a41aa3a119c1bfc7be039a78a6298ff99066b0a2fb3bbfeb6559a40
+  metadata.gz: 2c8392e166c5bad4c990c00344476adec37e7dff8176865202a8fedc47e853222197fc2837dd5ea780b96c7fbb92922bcb482206079d376c29c1fadee90a18d9
+  data.tar.gz: 66a9558d6ba34f591a82d1c1f5a92d8930fffde9258afc142e7dd68abbffbfbfdf830bbb2576cfe01e74bef6248ce2bc65b347c16cd08d434b69328fcc407c0b

data/app/models/zuora_connect/app_instance_base.rb

@@ -22,6 +22,9 @@ module ZuoraConnect
     CONNECT_APPLICATION_ID = 0
     CONNECT_COMMUNICATION_SLEEP = Rails.env.test? ? 0.seconds : 5.seconds
     CATALOG_LOOKUP_PAGE_SIZE = 10_000
+    CATALOG_LOOKUP_CACHE_TIME_KEY = 'CatalogCachedAt'
+    CATALOG_LOOKUP_TTL = 60.seconds
+    CATALOG_LOOKUP_CACHE_RESULT_KEY = 'CatalogCache'
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
@@ -1015,25 +1018,29 @@ module ZuoraConnect
         end
 
         if source == 'API'
-          zuora_login = self.login_lookup(type: 'Zuora').first
-          login = zuora_login.client(entity_reference)
-
           catalog_container = {}
-          response = {
-            'nextPage' => login.rest_endpoint("catalog/products?pageSize=#{CATALOG_LOOKUP_PAGE_SIZE}")
-          }
-          while response['nextPage'].present?
-            url = login.rest_endpoint(response['nextPage'].split('/v1/').last)
-            output_json, response = login.rest_call(debug: false, url: url, timeout_retry: true)
-
-            case object
-            when :product
-              output_json.fetch('products', []).each do |product|
-                if object_id.nil?
-                  catalog_container[product['id']] = product.except('productRatePlans')
-                elsif object_id.is_a?(String)
-                  next unless product['id'] == object_id
 
+          if (Redis.current.hget(CATALOG_LOOKUP_CACHE_TIME_KEY, self.id).to_i + CATALOG_LOOKUP_TTL.to_i) > Time.now.to_i
+            begin
+              catalog_container = JSON.parse(Redis.current.hget(CATALOG_LOOKUP_CACHE_RESULT_KEY, self.id))
+            rescue JSON::ParserError => ex
+              Rails.logger.warn('Failed to parse catalog cache', ex)
+            end
+          else
+            zuora_login = self.login_lookup(type: 'Zuora').first
+            login = zuora_login.client(entity_reference)
+
+            response = {
+              'nextPage' => login.rest_endpoint("catalog/products?pageSize=#{CATALOG_LOOKUP_PAGE_SIZE}")
+            }
+
+            while response['nextPage'].present?
+              url = login.rest_endpoint(response['nextPage'].split('/v1/').last)
+              output_json, response = login.rest_call(debug: false, url: url, timeout_retry: true)
+
+              case object
+              when :product
+                output_json.fetch('products', []).each do |product|
                   rate_plans = {}
                   product['productRatePlans'].each do |rate_plan|
                     charges = {}
@@ -1058,13 +1065,23 @@ module ZuoraConnect
                   end
 
                   product['productRatePlans'] = rate_plans
-                  catalog_container = product
+                  catalog_container[product['id']] = product
                 end
+              else
+                raise "Available objects include [:product]"
               end
-            else
-              raise "Available objects include [:product]"
             end
+
+            Redis.current.hset(CATALOG_LOOKUP_CACHE_RESULT_KEY, self.id, catalog_container.to_json)
+            Redis.current.hset(CATALOG_LOOKUP_CACHE_TIME_KEY, self.id, Time.now.to_i)
           end
+
+          if object_id.nil?
+            catalog_container.transform_values! { |v| v.except('productRatePlans') }
+          elsif object_id.is_a?(String)
+            catalog_container = catalog_container[object_id]
+          end
+
           return catalog_container
         end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60p"
+  VERSION = "2.0.60q"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60p
+  version: 2.0.60q
 platform: ruby
 authors:
 - Connect Team