zuora_connect 2.0.60o → 2.0.60t

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d82918ec805d77782d6697f71fa0e28c85c75d243632207a2930046aeacdc60
-  data.tar.gz: 9f2341b491fbb516259cd0ace04482da657f688000609ba6cca99a9d85437fc6
+  metadata.gz: d7eee2d7cabce6128892afac88428f3c7f77a3318e244bd3becdf521716d0a25
+  data.tar.gz: 12c07009df449c54d70bec094e16594f0a3ecdb251c59ffed230d64787939cfb
 SHA512:
-  metadata.gz: '059e06f6514b2580a013cedf8e37843936465f44c1b55020d0fc790862b3f983b6ecac6696c2b899db8eba94bfccf6fe431b8ae7422c1ef241b1c833652b87a1'
-  data.tar.gz: 0174a924a7291780e970718d2c98a6bf43819eae85f4b71afd43f5f4214b357587967cd3072d7f9996d21fe97897903f5e4da9d0bcce7b4915421982dcef3d72
+  metadata.gz: a45196b2a77449c349e1e1fe4b9853d08e35da763327e2f74134cee20f4ee4af9311a4298b048b937d1d4f5056e047f0db503f57b3b36f2335a963fe4e1f3336
+  data.tar.gz: d3d14ec18ce3da9ad27776cf2c79ed3b7f9aafa88c331f3a0efa9a2075258cf438e3dd469c50ba1e4d0e46d339ec0ba895632535ab9644dd8cf4a29513d77f7d

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/app/models/zuora_connect/zuora_user.rb

@@ -2,6 +2,6 @@ module ZuoraConnect
   class ZuoraUser < ActiveRecord::Base
     self.table_name = "zuora_users"
     attr_accessor :session
-    cattr_accessor :current_user
+    cattr_accessor :current_user_id
   end
 end

data/config/initializers/prometheus.rb

@@ -33,6 +33,8 @@ if defined? Prometheus
             file.write(Prometheus::Client::Formats::Text.marshal(@registry))
           end
         end
+      rescue
+        # Ignored
       end
     end
 

data/lib/zuora_connect/controllers/helpers.rb

@@ -442,7 +442,7 @@ module ZuoraConnect
                 @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
               end
               @zuora_user.session = session
-              ZuoraConnect::ZuoraUser.current_user = @zuora_user
+              ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
               session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
@@ -685,7 +685,7 @@ module ZuoraConnect
         key = ZuoraConnect.configuration.dev_mode_pass
         values = {:user => user , :key => key, :appinstance => session["appInstance"]}
         @appinstance = ZuoraConnect::AppInstance.find_by(:id => values[:appinstance].to_i)
-        ZuoraConnect::ZuoraUser.current_user = user
+        ZuoraConnect::ZuoraUser.current_user_id = 0
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60o"
+  VERSION = "2.0.60t"
 end

data/lib/zuora_connect/zuora_audit.rb

@@ -9,7 +9,7 @@ module ZuoraConnect
     module ClassMethods
       def zuora_audit
         include ZuoraConnect::ZuoraAudit::ZuoraAuditInstanceMethods
-        after_create :set_created_by_id
+        before_create :set_created_by_id
         before_update :set_updated_by_id
       end
     end
@@ -24,7 +24,7 @@ module ZuoraConnect
       end
 
       def current_user_id
-        return ZuoraConnect::ZuoraUser.current_user
+        return ZuoraConnect::ZuoraUser.current_user_id
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60o
+  version: 2.0.60t
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment