zuora_connect 2.0.60p → 2.0.60u

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49954ce1a10057c773fa3dbc859cccd19e756297192ee85d276cada97c085446
-  data.tar.gz: bd0ce83a9631479cb2402383c5a53e104742d19fb83b951d24cdf5fe66b48bfb
+  metadata.gz: 92a983cff8e7ff831929da9496cbb34e728f2033e79135c8bb76fa604bd33e71
+  data.tar.gz: 67170a20afb4fee284cc402484e5770b47422ebbeb7652dca39ceab862ca4d20
 SHA512:
-  metadata.gz: d1e341cea3b729c967af29ecfaa9bd143ef656a415487654ae59870ef75e3b719d4873975aa12fe6b845b3916d8ef1de2f63faca22c42c89280058d404c8d3b7
-  data.tar.gz: 22804e4a0db2285d91ef7c1da8fab9d67261ff13302b48db31f872c820d3b037425ece070a41aa3a119c1bfc7be039a78a6298ff99066b0a2fb3bbfeb6559a40
+  metadata.gz: cb814342311b45d90903a72fff8d7bb9d313b91fb89346e99039276af4aae03ed538841215c9737ebc237d80a3584f3955c6e30e48a8e0c322ba7c7fd145ad78
+  data.tar.gz: 8f3d002f881cc6403baaae4f00bb88c8fff0f063c4a6290f4ad2c02c49361afe037717c6a55823a1834a9b29e3f16f11b2339211b992f83c42042133ebe33c55

data/app/models/zuora_connect/app_instance_base.rb

@@ -22,6 +22,11 @@ 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'
+    TIMEZONE_LOG_RATE_LIMIT_KEY = 'TimezoneLoggedAt'
+    TIMEZONE_LOG_PERIOD = 4.hours
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
@@ -242,48 +247,7 @@ module ZuoraConnect
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
 
-      begin
-        sql = <<-eos
-          SELECT zuora_users.zuora_identity_response 
-          FROM "#{self.id}".zuora_users 
-          ORDER BY zuora_users.updated_at DESC 
-          LIMIT 1;
-        eos
-        user = ActiveRecord::Base.connection.execute(sql).to_a.first
-
-        if user.present?
-          zuora_identity_response = JSON.parse(user.fetch('zuora_identity_response', '{}'))
-          self.user_timezone = zuora_identity_response.values.first&.dig('timeZone')
-        end
-      rescue => ex
-        Rails.logger.error('Failed to get users while setting app instance timezone', ex)
-      end
-
-      if self.user_timezone.present?
-        # connect instance which has a custom timezone
-        if !self.auto_deployed? && (
-          ActiveSupport::TimeZone[self.task_data.dig('user_settings', 'timezone') || '']&.utc_offset !=
-            ActiveSupport::TimeZone[self.user_timezone]&.utc_offset
-        )
-          if self.environment == 'Production'
-            ZuoraConnect.logger.error(
-              "Instance and user timezones are different. User has '#{self.user_timezone}' and " \
-              "instance has '#{self.task_data.dig('user_settings', 'timezone')}'",
-              app_instance_id: self.id
-            )
-          end
-          self.user_timezone = nil
-          Time.zone = self.timezone
-        else
-          begin
-            Time.zone = self.user_timezone
-          rescue ArgumentError
-            Time.zone = self.timezone
-          end
-        end
-      else
-        Time.zone = self.timezone
-      end
+      self.set_timezone
 
       if self.task_data.present?
         tenants = self.task_data.fetch('tenant_ids', [])
@@ -316,6 +280,67 @@ module ZuoraConnect
       end
     end
 
+    def set_timezone(timezone: self.timezone, type: :default)
+      if timezone.blank?
+        timezone = self.timezone
+      end
+
+      if type == :default
+        Time.zone = timezone
+      elsif type == :user
+        begin
+          sql = <<-eos
+            SELECT zuora_users.zuora_identity_response 
+            FROM "#{self.id}".zuora_users 
+            ORDER BY zuora_users.updated_at DESC 
+            LIMIT 1;
+          eos
+          user = ActiveRecord::Base.connection.execute(sql).to_a.first
+
+          if user.present?
+            zuora_identity_response = JSON.parse(user.fetch('zuora_identity_response', '{}'))
+            self.user_timezone = zuora_identity_response.values.first&.dig('timeZone')
+          else
+            Rails.logger.error('Cannot find any user to set the timezone', app_instance_id: self.id)
+          end
+        rescue => ex
+          Rails.logger.error('There is an error while getting timezone users', ex)
+        end
+
+        if self.user_timezone.present?
+          # connect instance which has a custom timezone
+          if !self.auto_deployed? && (
+            ActiveSupport::TimeZone[self.task_data.dig('user_settings', 'timezone') || '']&.utc_offset !=
+              ActiveSupport::TimeZone[self.user_timezone]&.utc_offset
+          )
+            if self.environment == 'Production' &&
+              (Redis.current.hget(TIMEZONE_LOG_RATE_LIMIT_KEY, self.id).to_i + TIMEZONE_LOG_PERIOD.to_i) <= Time.now.to_i
+              ZuoraConnect.logger.error(
+                "Instance and user timezones are different. User has '#{self.user_timezone}' and " \
+                "instance has '#{self.task_data.dig('user_settings', 'timezone')}'",
+                app_instance_id: self.id
+              )
+              Redis.current.hset(TIMEZONE_LOG_RATE_LIMIT_KEY, self.id, Time.now.to_i)
+            end
+            self.user_timezone = nil
+            Time.zone = timezone
+          else
+            begin
+              Time.zone = self.user_timezone
+            rescue ArgumentError
+              Rails.logger.error('Malformed user timezone', app_instance_id: self.id)
+              Time.zone = timezone
+            end
+          end
+        else
+          Time.zone = timezone
+        end
+      end
+    rescue => e
+      Rails.logger.error('Malformed timezone used', e, app_instance_id: self.id)
+      Time.zone = self.timezone
+    end
+
     def auto_deployed?
       self.id >= 25000000
     end
@@ -1015,25 +1040,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 +1087,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/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

@@ -138,12 +138,8 @@ module ZuoraConnect
             end
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end
-          begin
-            if @appinstance.user_timezone.blank?
-              Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-            end
-          rescue
-            ZuoraConnect.logger.error(ex)
+          if @appinstance.user_timezone.blank?
+            @appinstance.set_timezone(timezone: session["#{@appinstance.id}::user::timezone"], type: :default)
           end
         end
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex

data/lib/zuora_connect/version.rb

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

metadata

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