zuora_connect 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd442f2f79a1b540e36d2247d1e47358d5c7a26
-  data.tar.gz: 65df716cc903105153b77d6fb86b8a4dc6b79bef
+  metadata.gz: d7678bfcc2f33c91cfbab0a0fc7d5166556951b6
+  data.tar.gz: 274570d12af9e5060ecd113f7c3653ffb986f0b7
 SHA512:
-  metadata.gz: 90d95e90b63b79a04dec028ca016bc6408d4bd51788cf280955344e083f82720d1e9bc49f71f38705244dfe740942f91b564cbf05bba61e0530a32a584239b4f
-  data.tar.gz: 96eccbdc969fcf86ebadeefe2ead81877a2d6ea477d11ddff4845777c91ddbdac625cd4f316d0fae055aa368d78a6f0f3c31853476e4a422e44371f922bf8a1d
+  metadata.gz: 0b1240b7bf2f30b3160de9323a7c19e7d0a7dff6bfc207d6338ad52ea965783140135cc7e61743be7606fa8d01268da3901c4030d366cded48c652306f09feb1
+  data.tar.gz: 6892a573c4e855c29871d2113e911d6529d153ca9fe11055279126a32bcbca5222cf607c25d9201d4929a2efdf63e733d52f4b20476711db11e0964fb4f48c23

data/app/models/zuora_connect/app_instance.rb

@@ -1,5 +1,6 @@
 module ZuoraConnect
   class AppInstance < ZuoraConnect::AppInstanceBase
+    default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_products", "catalog_rateplans", "catalog_charges", "catalog_mapping", "catalog"].include?(x) }) }
 
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -1,6 +1,6 @@
 module ZuoraConnect
   class AppInstanceBase < ActiveRecord::Base
-    default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
+    default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_products", "catalog_rateplans", "catalog_charges", "catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
     self.table_name = "zuora_connect_app_instances"
     attr_accessor :options, :mode, :logins, :valid, :task_data, :last_refresh, :username, :password, :s3_client, :api_version
@@ -44,20 +44,20 @@ module ZuoraConnect
       return ActiveSupport::MessageEncryptor.new(secret, sign_secret)
     end
 
-    def catalog_outdated?
-      return self.catalog_updated_at.blank? || (self.catalog_updated_at < Time.now - 12.hours)
+    def catalog_outdated?(time: Time.now - 12.hours)
+      return self.catalog_updated_at.blank? || (self.catalog_updated_at < time)
     end
 
     def catalog_lookup(entity_id: nil, object: :product, object_id: nil, map_lower_objects: true)
       entity_reference = entity_id.blank? ? 'Default' : entity_id
-      object_hierarchy = ZuoraConnect::AppInstance.unscoped.select("catalog_mapping -> '#{entity_reference}' as item").where(id: self.id).first.item[object_id]
+      object_hierarchy = (JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog_mapping #> \'{%s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s LIMIT 1' % [entity_reference, self.id]).first["item"] || "{}") [object_id] || {"productId" => "SAFTEY", "productRatePlanId" => "SAFTEY", "productRatePlanChargeId" => "SAFTEY"})
 
       case object
       when :product
         if object_id.blank?
-          stub_catalog = (ZuoraConnect::AppInstance.unscoped.select("catalog -> '#{entity_reference}' as item").where(id: self.id).first.item || {})
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
         else
-          stub_catalog = (ZuoraConnect::AppInstance.unscoped.select("catalog #> '{#{entity_reference}, #{object_id}}' as item").where(id: self.id).first.item || {})
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_id,  self.id]).first["item"] || "{}")
         end
 
         if !map_lower_objects
@@ -65,9 +65,9 @@ module ZuoraConnect
         end
       when :rateplan
         if object_id.blank?
-          stub_catalog = (ActiveRecord::Base.connection.execute("SELECT \"value\" #>'{productRatePlans}' as \"rateplan\" from \"public\".\"zuora_connect_app_instances\", json_each((\"public\".\"zuora_connect_app_instances\".\"catalog\"::json -> '#{entity_reference}')) AS e(key, value) WHERE \"id\" = #{self.id}") || {}).map {|rp| JSON.parse(rp["rateplan"])}.reduce({}, :merge)
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT json_object_agg(rateplan_id, rateplan) as "charges" FROM "public"."zuora_connect_app_instances", jsonb_each(("public"."zuora_connect_app_instances"."catalog" #> \'{%s}\' )) AS e(product_id, product), jsonb_each(product #> \'{productRatePlans}\') AS ee(rateplan_id, rateplan) WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
         else
-          stub_catalog = (ZuoraConnect::AppInstance.unscoped.select("catalog #> '{#{entity_reference}, #{object_hierarchy['productId']}, productRatePlans, #{object_id}}' as item").where(id: self.id).first.item || {})
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s, productRatePlans, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_hierarchy['productId'], object_id,  self.id]).first["item"] || "{}")
         end
 
         if !map_lower_objects
@@ -75,14 +75,12 @@ module ZuoraConnect
         end
       when :charge
         if object_id.blank?
-          #Still Needs Fixing
-          stub_catalog = (ActiveRecord::Base.connection.execute("SELECT \"value\" #>'{productRatePlans}' as \"rateplan\" from \"public\".\"zuora_connect_app_instances\", json_each((\"public\".\"zuora_connect_app_instances\".\"catalog\"::json -> '#{entity_reference}')) AS e(key, value) WHERE \"id\" = #{self.id}") || {}).map {|rp| JSON.parse(rp["rateplan"])}.reduce({}, :merge)
-          stub_catalog = stub_catalog.map{|k,x| x["productRatePlanCharges"] }.reduce({}, :merge)
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT json_object_agg(charge_id, charge) as item FROM "public"."zuora_connect_app_instances", jsonb_each(("public"."zuora_connect_app_instances"."catalog" #> \'{%s}\' )) AS e(product_id, product), jsonb_each(product #> \'{productRatePlans}\') AS ee(rateplan_id, rateplan), jsonb_each(rateplan #> \'{productRatePlanCharges}\') AS eee(charge_id, charge) WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
         else
-          stub_catalog = (ZuoraConnect::AppInstance.unscoped.select("catalog #> '{#{entity_reference}, #{object_hierarchy['productId']}, productRatePlans, #{object_hierarchy['productRatePlanId']}, productRatePlanCharges, #{object_id}}' as item").where(id: self.id).first.item || {})
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s, productRatePlans, %s, productRatePlanCharges, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_hierarchy['productId'], object_hierarchy['productRatePlanId'], object_id, self.id]).first["item"] || "{}")
         end
       end
-
+   
       return stub_catalog
     end
 
@@ -98,27 +96,56 @@ module ZuoraConnect
       return results
     end
 
-
-    def get_catalog(zuora_login: self.login_lookup.first, force_update: false, entity_id: nil)
+    def get_catalog(zuora_login: self.login_lookup(type: "Zuora").first, entity_id: nil)
       entity_reference = entity_id.blank? ? 'Default' : entity_id
       Rails.logger.debug("Fetching catalog for default") if entity_id.blank?
       Rails.logger.debug("Fetching catalog for entity #{entity_id}") if !entity_id.blank?
-      if catalog_outdated? || force_update
-        Rails.logger.debug("Fetch Catalog")
-        self.update_column(:catalog_updated_at, Time.now.utc)
-        products, catalog_mapping = zuora_login.client(entity_reference).get_catalog
+      Rails.logger.debug("Fetch Catalog")
+      self.update_column(:catalog_updated_at, Time.now.utc)
+
+      login = zuora_login.client(entity_reference)
+
+      old_logger = ActiveRecord::Base.logger
+      ActiveRecord::Base.logger = nil
+      ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{%{entity}}\', \'{}\'), "catalog_mapping" = jsonb_set("catalog_mapping", \'{%{entity}}\', \'{}\') where "id" = %{id}' % {:entity => entity_reference, :id => self.id})
+     
+      response = {'nextPage' => login.rest_endpoint('catalog/products?pageSize=5')}
+      while !response["nextPage"].blank?
+        url = login.rest_endpoint(response["nextPage"].split('/v1/').last)
+        Rails.logger.debug("Fetch Catalog URL #{url}")
+        output_json, response = login.rest_call(:debug => false, :url => url)
+
+        if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}")
+        end
+
+        output_json["products"].each do |product|
+          ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog_mapping" = jsonb_set("catalog_mapping", \'{%s, %s}\', \'%s\') where "id" = %s' % [entity_reference, product["id"], {"productId" => product["id"]}.to_json.gsub("'", "''"), self.id])
+          rateplans = {}
+
+          product["productRatePlans"].each do |rateplan|
+            ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog_mapping" = jsonb_set("catalog_mapping", \'{%s, %s}\', \'%s\') where "id" = %s' % [entity_reference, rateplan["id"],  {"productId" => product["id"], "productRatePlanId" => rateplan["id"]}.to_json.gsub("'", "''"), self.id])
+            charges = {}
 
-        # Update this entity
-        ActiveRecord::Base.connection.execute("UPDATE \"public\".\"zuora_connect_app_instances\" SET \"catalog\" = jsonb_set(\"catalog\", '{#{entity_reference}}', '#{products.to_json}') where \"id\" = #{self.id}")
+            rateplan["productRatePlanCharges"].each do |charge|
+              ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog_mapping" = jsonb_set("catalog_mapping", \'{%s, %s}\', \'%s\') where "id" = %s' % [entity_reference, charge["id"],  {"productId" => product["id"], "productRatePlanId" => rateplan["id"], "productRatePlanChargeId" => charge["id"]}.to_json.gsub("'", "''"), self.id])
 
-        # Update this entity mapping
-        ActiveRecord::Base.connection.execute("UPDATE \"public\".\"zuora_connect_app_instances\" SET \"catalog_mapping\" = jsonb_set(\"catalog_mapping\", '{#{entity_reference}}', '#{catalog_mapping.to_json}') where \"id\" = #{self.id}")
+              charges[charge["id"]] = charge.merge({"productId" => product["id"], "productName" => product["name"], "productRatePlanId" => rateplan["id"], "productRatePlanName" => rateplan["name"] })
+            end
+
+            rateplan["productRatePlanCharges"] = charges
+            rateplans[rateplan["id"]] = rateplan.merge({"productId" => product["id"], "productName" => product["name"]})
+          end
+          product["productRatePlans"] = rateplans
+
+          ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{%s, %s}\', \'%s\') where "id" = %s' % [entity_reference, product["id"], product.to_json.gsub("'", "''"), self.id])
+        end
+        ActiveRecord::Base.logger = old_logger
 
         self.touch
       end
 
-      # DO NOT RETURN CATALOG. THIS IS NOT SCALABLE WITH LARGE CATALOGS. USE THE 
-      # return self.catalog[entity_reference]
+      # DO NOT RETURN CATALOG. THIS IS NOT SCALABLE WITH LARGE CATALOGS. USE THE  CATALOG_LOOKUP method provided
       return true
     end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - Connect Team