zuora_connect 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1410ae4de73fd8f7f2e6fef3027fed7db4cfdefd
-  data.tar.gz: f6e58da4ef1ef843ad3ae375cdec9efcbe035f2b
+  metadata.gz: b71ed8ef8cd914b208e867b6e68873beb0f5de11
+  data.tar.gz: 68770c0e6a652a46c21e8b0fe8c6c095505324ad
 SHA512:
-  metadata.gz: 883f282baf0cf7e989e923b01c9f469adf5134d380cb7a28c440aa5fb8ca2de3e6229f56288c722a0a0aa535bbbd66aa8b3052d4ae1a29a62d427a369bb65740
-  data.tar.gz: 21d6572bcc331ee83af35852ed64bd1cc3bd5ae953a5894237b58ff3cf163c32a0999d9d9706ecb60ed92f1baf4d8fae4ba68dc4d9be2ae0646107fa2d20e8e2
+  metadata.gz: d9211986730903e4e0e6ac0e32e7fc1555eb4459c1c96dbc2dac4ad3f8dfa37452deaedbb95fe9589412c97cf3b6c814284eeb10836f9880fd74d53c17b1f319
+  data.tar.gz: 28ed8d8df382e5c8398afd664b78d0dd0281419620b3e2d18221c372c7d580bdced516a2eb485c2e32e225e58aa36a0994e1f3183977f376f06873aaed7f9b6c

data/app/models/zuora_connect/app_instance_base.rb

@@ -1,5 +1,6 @@
 module ZuoraConnect
   class AppInstanceBase < ActiveRecord::Base
+    default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["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
@@ -47,22 +48,39 @@ module ZuoraConnect
       return self.catalog_updated_at.blank? || (self.catalog_updated_at < Time.now - 12.hours)
     end
 
-    def catalog_lookup(entity_id: nil, object: :product, map_lower_objects: true)
+    def catalog_lookup(entity_id: nil, object: :product, object_id: nil, map_lower_objects: true)
       entity_reference = entity_id.blank? ? 'Default' : entity_id
-      stub_catalog = ((self.catalog || {})[entity_reference] || {})
+      object_hierarchy = ZuoraConnect::AppInstance.unscoped.select("catalog_mapping -> '#{entity_reference}' as item").where(id: self.id).first.item[object_id]
+
       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 || {})
+        else
+          stub_catalog = (ZuoraConnect::AppInstance.unscoped.select("catalog #> '{#{entity_reference}, #{object_id}}' as item").where(id: self.id).first.item || {})
+        end
+
         if !map_lower_objects
           stub_catalog = stub_catalog.map{|k,v| [k,v.except("productRatePlans").merge({"productRatePlans" =>  v["productRatePlans"].map {|k,v| v.except("productRatePlanCharges").merge({"productRatePlanCharges" =>  v["productRatePlanCharges"].map {|k,v| v}})}})]}.to_h
         end
       when :rateplan
-        stub_catalog = stub_catalog.map {|k,x| x["productRatePlans"] }.reduce({}, :merge)
+        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)
+        else
+          stub_catalog = (ZuoraConnect::AppInstance.unscoped.select("catalog #> '{#{entity_reference}, #{object_hierarchy['productId']}, productRatePlans, #{object_id}}' as item").where(id: self.id).first.item || {})
+        end
 
         if !map_lower_objects
           stub_catalog = stub_catalog.map {|k,v| [k,v.except("productRatePlanCharges").merge({"productRatePlanCharges" =>  v["productRatePlanCharges"].map {|k,v| v}})]}.to_h
         end
       when :charge
-        stub_catalog = stub_catalog.map {|k,x| x["productRatePlans"].map{|k,x| x["productRatePlanCharges"] }.reduce({}, :merge)}.reduce({}, :merge)
+        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)
+        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 || {})
+        end
       end
 
       return stub_catalog
@@ -80,6 +98,7 @@ module ZuoraConnect
       return results
     end
 
+
     def get_catalog(zuora_login: self.login_lookup.first, force_update: false, entity_id: nil)
       entity_reference = entity_id.blank? ? 'Default' : entity_id
       Rails.logger.debug("Fetching catalog for default") if entity_id.blank?
@@ -87,13 +106,20 @@ module ZuoraConnect
       if catalog_outdated? || force_update
         Rails.logger.debug("Fetch Catalog")
         self.update_column(:catalog_updated_at, Time.now.utc)
-        products = zuora_login.client(entity_reference).get_catalog
-        self.catalog = {} if self.catalog.blank? || self.catalog.class == Array
-        self.catalog[entity_reference] = products.blank? ? {} : products
-        self.update_column(:catalog, self.catalog)
+        products, catalog_mapping = zuora_login.client(entity_reference).get_catalog
+
+        # 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}")
+
+        # 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}")
+
         self.touch
       end
-      return self.catalog[entity_reference]
+
+      # DO NOT RETURN CATALOG. THIS IS NOT SCALABLE WITH LARGE CATALOGS. USE THE 
+      # return self.catalog[entity_reference]
+      return true
     end
 
     def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token)

data/db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb

@@ -0,0 +1,5 @@
+class AddCatalogMappingsToAppInstance < ActiveRecord::Migration
+  def change
+    add_column :zuora_connect_app_instances, :catalog_mapping, :jsonb, default: {} unless column_exists? :zuora_connect_app_instances, :catalog_mapping
+  end
+end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -218,6 +218,7 @@ files:
 - db/migrate/20110411200303_add_expiration_to_app_instance.rb
 - db/migrate/20110413191512_add_new_api_token.rb
 - db/migrate/20110503003602_add_catalog_data_to_app_instance.rb
+- db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb