zuora_connect 2.0.60i → 2.0.60n

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc4afe6a78f90d6c87cfa73da32a7b129a5e584672886cad408368694aad1aa
-  data.tar.gz: bdfcffca2d8ec4eb224408b25c6b14248bde1623265cca5be7a6e46ea2c63931
+  metadata.gz: 97f4f62548850bb29aa5afe9dabfd967279d0900771599bac82cc67ea44b73f2
+  data.tar.gz: cebd295e51df06156e5e054e15c681b83cdec69d39a42dfd267fcd2d6f094f42
 SHA512:
-  metadata.gz: 45fbd12da62db03d87bfb2879efe01a531bb23560785145d296b68e5d06d97dbd31d6e382f2c7f53d48267a91bbaf64ca907c10d0d009c1e21bd1b13ca442acc
-  data.tar.gz: 433893af604861265c826253fb5d40236f1662ef78506bac6c87d82c315552a42297668f393c73b32e7bcdb8ce501a33ae0fc0b48dd9dff95fb43ad61c16fde2
+  metadata.gz: a77a8dacf8c09f5dd3aec37fe1cbb597574588e44ead312d3af0d42d2f80c59ee3fd4d123aeca5d5c60d5faf73d9d5dbe57575d2c83aa37b58f303efc6b502ca
+  data.tar.gz: 49123c079c3561c3a406358192c9289dbe438d4f9b4687c8686a92b10d828825d47dfbe939f0c84eab89e15ee2662ecea5b0c4b47af08326897e7f2bcfb30887

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,50 @@ module ZuoraConnect
       rescue I18n::InvalidLocale => ex
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
-      Time.zone = self.timezone
+
+      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
+
       if self.task_data.present?
         tenants = self.task_data.fetch('tenant_ids', [])
         organizations = self.task_data.fetch('organizations', [])
@@ -272,6 +315,10 @@ module ZuoraConnect
       end
     end
 
+    def auto_deployed?
+      self.id >= 25000000
+    end
+
     def refresh(session: {}) 
       refresh_count ||= 0
       skip_connect ||= false

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
   end
 end

data/lib/zuora_connect.rb

@@ -13,6 +13,9 @@ require 'logging/connect_formatter'
 require 'metrics/influx/point_value'
 require 'metrics/net'
 require 'mono_logger'
+require 'zuora_connect/zuora_audit'
+require 'active_record'
+::ActiveRecord::Base.send :include, ZuoraConnect::ZuoraAudit
 
 module ZuoraConnect
   class << self

data/lib/zuora_connect/controllers/helpers.rb

@@ -132,11 +132,16 @@ module ZuoraConnect
             if locale.include?("-")
               locale = locale.split("-").first
               retry
+            elsif locale != session["#{@appinstance.id}::user::language"]
+              locale = session["#{@appinstance.id}::user::language"]
+              retry
             end
             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
@@ -437,6 +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
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
               session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
@@ -679,6 +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
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin

data/lib/zuora_connect/version.rb

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

data/lib/zuora_connect/zuora_audit.rb

@@ -0,0 +1,31 @@
+# Added by @Vina
+# Description: This automatically stamp user created/updated the record for DataQuery Audit
+# Usage: add 'zuora_audit' to your model.rb that you would like to track
+
+module ZuoraConnect
+  module ZuoraAudit
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def zuora_audit
+        include ZuoraConnect::ZuoraAudit::ZuoraAuditInstanceMethods
+        after_create :set_created_by_id
+        before_update :set_updated_by_id
+      end
+    end
+
+    module ZuoraAuditInstanceMethods
+      def set_created_by_id
+        self.created_by_id = current_user_id if defined?(self.created_by_id)
+      end
+
+      def set_updated_by_id
+        self.updated_by_id = current_user_id if defined?(self.updated_by_id)
+      end
+
+      def current_user_id
+        return ZuoraConnect::ZuoraUser.current_user
+      end
+    end
+  end
+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.60n
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -374,6 +374,7 @@ files:
 - lib/zuora_connect/exceptions.rb
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
+- lib/zuora_connect/zuora_audit.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile