zuora_connect 2.0.60j → 2.0.60o

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a3847105e8376738ca1183becbbbaae8f6f1b8d5a6fad0dca2207bc8526da2
-  data.tar.gz: 99d274d4cd3e5ab15f148fbda907aa51555c52f01c7acd3b88610b6d829d5351
+  metadata.gz: 7d82918ec805d77782d6697f71fa0e28c85c75d243632207a2930046aeacdc60
+  data.tar.gz: 9f2341b491fbb516259cd0ace04482da657f688000609ba6cca99a9d85437fc6
 SHA512:
-  metadata.gz: 15e5d1d61dbf20dc6f51419482da3f5804a70e04b40febbee74588b8f7036ca2530aec84fdc58cbaa90add318f48d6c5318188b195e3f98d1fb181092104a732
-  data.tar.gz: 1863947d49d8d854456466e17dc35183ba0bc36af30fa272027932bfdf8b0bc09bb98be525fc344ee9649670e1bae0285756838c80cc7d55e524d6dc81e22418
+  metadata.gz: '059e06f6514b2580a013cedf8e37843936465f44c1b55020d0fc790862b3f983b6ecac6696c2b899db8eba94bfccf6fe431b8ae7422c1ef241b1c833652b87a1'
+  data.tar.gz: 0174a924a7291780e970718d2c98a6bf43819eae85f4b71afd43f5f4214b357587967cd3072d7f9996d21fe97897903f5e4da9d0bcce7b4915421982dcef3d72

data/app/models/zuora_connect/app_instance_base.rb

@@ -21,6 +21,7 @@ module ZuoraConnect
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_APPLICATION_ID = 0
     CONNECT_COMMUNICATION_SLEEP = Rails.env.test? ? 0.seconds : 5.seconds
+    CATALOG_LOOKUP_PAGE_SIZE = 10_000
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
@@ -241,14 +242,35 @@ module ZuoraConnect
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
 
-      user = ZuoraConnect::ZuoraUser.order(updated_at: :desc).first
-      self.user_timezone = user ? user.zuora_identity_response.values.first&.dig('timeZone') : nil
+      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? && self.task_data.dig('user_settings', 'timezone') != self.user_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', app_instance_id: self.id)
+            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
@@ -985,13 +1007,67 @@ module ZuoraConnect
       # object_id: The id or id's of the object/objects to be returned.
       # child_objects: Whether to include child objects of the object in question.
       # cache: Store individual "1" object lookup in redis for caching.
-      def catalog_lookup(entity_id: nil, object: :product, object_id: nil, child_objects: false, cache: false)
+      def catalog_lookup(entity_id: nil, object: :product, object_id: nil, child_objects: false, cache: false, source: 'DB')
         entity_reference = entity_id.blank? ? 'Default' : entity_id
 
         if object_id.present? && ![Array, String].include?(object_id.class)
           raise "Object Id can only be a string or an array of strings"
         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
+
+                  rate_plans = {}
+                  product['productRatePlans'].each do |rate_plan|
+                    charges = {}
+                    rate_plan['productRatePlanCharges'].each do |charge|
+                      charges[charge['id']] = charge.merge(
+                        {
+                          'productId' => product['id'],
+                          'productName' => product['name'],
+                          'productRatePlanId' => rate_plan['id'],
+                          'productRatePlanName' => rate_plan['name'],
+                        }
+                      )
+                    end
+
+                    rate_plan['productRatePlanCharges'] = charges
+                    rate_plans[rate_plan['id']] = rate_plan.merge(
+                      {
+                        'productId' => product['id'],
+                        'productName' => product['name']
+                      }
+                    )
+                  end
+
+                  product['productRatePlans'] = rate_plans
+                  catalog_container = product
+                end
+              end
+            else
+              raise "Available objects include [:product]"
+            end
+          end
+          return catalog_container
+        end
+
         if defined?(Redis.current) && object_id.present? && object_id.class == String && object_id.present?
           stub_catalog = cache ? decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}")) : nil
           object_hierarchy = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Hierarchy"))

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,6 +132,9 @@ 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
@@ -439,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"]
@@ -681,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.60j"
+  VERSION = "2.0.60o"
 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.60j
+  version: 2.0.60o
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-11 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