zuora_connect 2.0.60i → 2.0.60j

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc4afe6a78f90d6c87cfa73da32a7b129a5e584672886cad408368694aad1aa
-  data.tar.gz: bdfcffca2d8ec4eb224408b25c6b14248bde1623265cca5be7a6e46ea2c63931
+  metadata.gz: 27a3847105e8376738ca1183becbbbaae8f6f1b8d5a6fad0dca2207bc8526da2
+  data.tar.gz: 99d274d4cd3e5ab15f148fbda907aa51555c52f01c7acd3b88610b6d829d5351
 SHA512:
-  metadata.gz: 45fbd12da62db03d87bfb2879efe01a531bb23560785145d296b68e5d06d97dbd31d6e382f2c7f53d48267a91bbaf64ca907c10d0d009c1e21bd1b13ca442acc
-  data.tar.gz: 433893af604861265c826253fb5d40236f1662ef78506bac6c87d82c315552a42297668f393c73b32e7bcdb8ce501a33ae0fc0b48dd9dff95fb43ad61c16fde2
+  metadata.gz: 15e5d1d61dbf20dc6f51419482da3f5804a70e04b40febbee74588b8f7036ca2530aec84fdc58cbaa90add318f48d6c5318188b195e3f98d1fb181092104a732
+  data.tar.gz: 1863947d49d8d854456466e17dc35183ba0bc36af30fa272027932bfdf8b0bc09bb98be525fc344ee9649670e1bae0285756838c80cc7d55e524d6dc81e22418

data/app/models/zuora_connect/app_instance_base.rb

@@ -11,7 +11,7 @@ module ZuoraConnect
     before_destroy :prune_data
 
     self.table_name = "zuora_connect_app_instances"
-    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user, :logitems
+    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user, :logitems, :user_timezone
     @@telegraf_host = nil
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
     INSTANCE_REFRESH_WINDOW = 1.hours         #Used to set how how long till app starts attempting to refresh cached task connect data
@@ -240,7 +240,29 @@ module ZuoraConnect
       rescue I18n::InvalidLocale => ex
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
-      Time.zone = self.timezone
+
+      user = ZuoraConnect::ZuoraUser.order(updated_at: :desc).first
+      self.user_timezone = user ? user.zuora_identity_response.values.first&.dig('timeZone') : nil
+
+      if self.user_timezone.present?
+        # connect instance which has a custom timezone
+        if !self.auto_deployed? && self.task_data.dig('user_settings', 'timezone') != self.user_timezone
+          if self.environment == 'Production'
+            ZuoraConnect.logger.error('Instance and user timezones are different', 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
+
       if self.task_data.present?
         tenants = self.task_data.fetch('tenant_ids', [])
         organizations = self.task_data.fetch('organizations', [])
@@ -272,6 +294,10 @@ module ZuoraConnect
       end
     end
 
+    def auto_deployed?
+      self.id >= 25000000
+    end
+
     def refresh(session: {}) 
       refresh_count ||= 0
       skip_connect ||= false

data/lib/zuora_connect/controllers/helpers.rb

@@ -136,7 +136,9 @@ module ZuoraConnect
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end
           begin
-            Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
+            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)
           end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60i"
+  VERSION = "2.0.60j"
 end

metadata

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