zuora_connect 2.0.60l → 2.0.60q

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f68595c6354e9924c2e73bdb81246bdc858874f49830f94111e0d46b6e8298
-  data.tar.gz: 1b01b3c05190970c9ad92c461f64b89787b790f3e2ffb6394831ccce425e0d1a
+  metadata.gz: 3a9478b4c078e02402f100894a54bac2b08c1a89465e83ec55cb9f1bbe3f5dff
+  data.tar.gz: e0d5c40113abe3b72ef867ca59f620ce19dc1dee778a7e4e531aedae68a6812c
 SHA512:
-  metadata.gz: e58fc8cd5b36a2be218afab342507a78acb5221001cdc712e61a7e80ad0615797ed42c7ae413d4d5dc179d14784e91eb621ea5be9466a45e904ed97bd5996076
-  data.tar.gz: df3730519a5b2b1e8b3778866bd6ac59255633666522fe7ec8522e6815a1c87d5aba89fd733ec1eaecf6caeccf74fde010ea40a9d882b20d6fe2cfc4f1ee46a2
+  metadata.gz: 2c8392e166c5bad4c990c00344476adec37e7dff8176865202a8fedc47e853222197fc2837dd5ea780b96c7fbb92922bcb482206079d376c29c1fadee90a18d9
+  data.tar.gz: 66a9558d6ba34f591a82d1c1f5a92d8930fffde9258afc142e7dd68abbffbfbfdf830bbb2576cfe01e74bef6248ce2bc65b347c16cd08d434b69328fcc407c0b

data/app/models/zuora_connect/app_instance_base.rb

@@ -21,6 +21,10 @@ 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
+    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'
@@ -1006,13 +1010,81 @@ 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'
+          catalog_container = {}
+
+          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 = {}
+                    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['id']] = product
+                end
+              else
+                raise "Available objects include [:product]"
+              end
+            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
+
         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_id
   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

@@ -442,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_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"]
@@ -684,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_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.60l"
+  VERSION = "2.0.60q"
 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
+        before_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_id
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60l
+  version: 2.0.60q
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-12 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