zuora_connect 2.0.60m → 2.0.60r

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7bbbca4b37f1429f97fd4f2d173efba916f3b72616bbd5713b610b5269c7e1
-  data.tar.gz: 1fa5fd61bb859cf74b669eab6f6e1cc94672a46d5b261d73fa43fd6bde126751
+  metadata.gz: a6b7949598476b39650e1fb8b5f4c0940715a4fd7ceea1945b5049f93a468d41
+  data.tar.gz: 8505c3ee1339e3ce136424898b8202466c3264391e5920c0107f706927edae15
 SHA512:
-  metadata.gz: dd9b858b6e5478d7131b4b1119769c7dc95c881eca6439fa651711c87104d7cb3a656a6731a01090c99b5b6841b93d1b6c539b9218efa2a691b46d9912eff680
-  data.tar.gz: ecd6b793f756cc670d4c38d0366edd54d7eceb1a67d50b1dbff20b81b9da343b0da9dc978e0a9d88ff30c1aae040822491c07179da2d6f5d1ceef1607f491049
+  metadata.gz: c89370d8c846ace233b99f76ef6ee53aa0ec54deb4a7005457b154ae2597c2f6f8e9120816eb47a99083acf1429d770d6b01406af3f58b0f1e29904bfca54988
+  data.tar.gz: 20214d6197712b2aaf380535fbb2e635b0296cd8271c85f1bac28e3bacbb1587eea40542b4ac9a93c1f55ab71788c9b9c0a3eb424eee1d9d53f79042f3811c65

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
-    attr_accessor :current_user
+    cattr_accessor :current_user_id
   end
 end

data/config/initializers/prometheus.rb

@@ -27,7 +27,7 @@ if defined? Prometheus
       end
 
       def export
-        filename = File.join(@path, 'resque_export.prom')
+        filename = File.join(@path, "resque_export_#{Process.pid}.prom")
         @lock.synchronize do
           File.open(filename, 'w+') do |file|
             file.write(Prometheus::Client::Formats::Text.marshal(@registry))

data/lib/zuora_connect/controllers/helpers.rb

@@ -442,7 +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
+              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"]
@@ -685,7 +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
+        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.60m"
+  VERSION = "2.0.60r"
 end

data/lib/zuora_connect/zuora_audit.rb

@@ -9,7 +9,7 @@ module ZuoraConnect
     module ClassMethods
       def zuora_audit
         include ZuoraConnect::ZuoraAudit::ZuoraAuditInstanceMethods
-        after_create :set_created_by_id
+        before_create :set_created_by_id
         before_update :set_updated_by_id
       end
     end
@@ -24,7 +24,7 @@ module ZuoraConnect
       end
 
       def current_user_id
-        return ZuoraConnect::ZuoraUser.current_user
+        return ZuoraConnect::ZuoraUser.current_user_id
       end
     end
   end

metadata

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