zuora_connect 1.4.23 → 1.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f166e937a1b966ebbac5f07ac725ddbd56854646
-  data.tar.gz: 002328d7e34444aa72e5fb2b87831ed4ed51cd88
+  metadata.gz: 8f829fdae03f910c8502f0e92526964c38c848bf
+  data.tar.gz: ecbc0fc3b85fc1fd3e47dad7c4298e06e8d3d5a1
 SHA512:
-  metadata.gz: 85bc2d14075f943e3cc7013ea27a66d2e0e4368e776b5e238d7c82dd38ffa7e7141ada09a9abd25a3829f48f47ea58d051c09ceb5329956e6c1253a695f9eba2
-  data.tar.gz: 9cb9eb8fa884e14440f822380dbd34144e5ad386dab43779a8bc3ea9aa51d408464826d8df2f6b97de12d80e422a185ff3ab855f73ab832486c9ea7652fe7e09
+  metadata.gz: 541161343f45114327362236efb82eadd82b8adc97615abfce4a2842b43bc93b5c7761f9df2aeca5669c6b653b0b49747c09367d9aa2160e0feeb05cf633f000
+  data.tar.gz: 8f4221712d631e8cf2ea9f8f64fdbf050f987c8ba0cdee6a2b6a2d68934e8ba5c7f92a598817ae390a1cde3d301ebee029596bebc3ec48e5ffb89630dff9bb41

data/app/models/zuora_connect/app_instance_base.rb

@@ -208,17 +208,12 @@ module ZuoraConnect
       Rails.logger.debug("Fetching catalog for default") if entity_id.blank?
       Rails.logger.debug("Fetching catalog for entity #{entity_id}") if !entity_id.blank?
       Rails.logger.debug("Fetch Catalog")
-      if defined?(Redis.current)
-        Redis.current.keys("Catalog:#{self.id}:*").each do |key|
-          Redis.current.del(key.to_s)
-        end
-      end
-
+    
       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})
+      ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{tmp}\', \'{}\'), "catalog_mapping" = jsonb_set("catalog_mapping", \'{tmp}\', \'{}\') where "id" = %{id}' % {:id => self.id})
      
       response = {'nextPage' => login.rest_endpoint("catalog/products?pageSize=#{page_size}")}
       while !response["nextPage"].blank?
@@ -231,15 +226,15 @@ module ZuoraConnect
         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])
+          ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog_mapping" = jsonb_set("catalog_mapping", \'{tmp, %s}\', \'%s\') where "id" = %s' % [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])
+            ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog_mapping" = jsonb_set("catalog_mapping", \'{tmp, %s}\', \'%s\') where "id" = %s' % [rateplan["id"],  {"productId" => product["id"], "productRatePlanId" => rateplan["id"]}.to_json.gsub("'", "''"), self.id])
             charges = {}
 
             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])
+              ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog_mapping" = jsonb_set("catalog_mapping", \'{tmp, %s}\', \'%s\') where "id" = %s' % [charge["id"],  {"productId" => product["id"], "productRatePlanId" => rateplan["id"], "productRatePlanChargeId" => charge["id"]}.to_json.gsub("'", "''"), self.id])
 
               charges[charge["id"]] = charge.merge({"productId" => product["id"], "productName" => product["name"], "productRatePlanId" => rateplan["id"], "productRatePlanName" => rateplan["name"] })
             end
@@ -249,9 +244,19 @@ module ZuoraConnect
           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])
+          ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{tmp, %s}\', \'%s\') where "id" = %s' % [product["id"], product.to_json.gsub("'", "''"), self.id])
+        end
+      end
+
+      # Move from tmp to actual
+      ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{%{entity}}\', "catalog" #> \'{tmp}\'), "catalog_mapping" = jsonb_set("catalog_mapping", \'{%{entity}}\',  "catalog_mapping" #> \'{tmp}\') where "id" = %{id}' % {:entity => entity_reference, :id => self.id})
+      if defined?(Redis.current)
+        Redis.current.keys("Catalog:#{self.id}:*").each do |key|
+          Redis.current.del(key.to_s)
         end
       end
+      # Clear tmp holder
+      ActiveRecord::Base.connection.execute('UPDATE "public"."zuora_connect_app_instances" SET "catalog" = jsonb_set("catalog", \'{tmp}\', \'{}\'), "catalog_mapping" = jsonb_set("catalog_mapping", \'{tmp}\', \'{}\') where "id" = %{id}' % {:id => self.id})
 
       ActiveRecord::Base.logger = old_logger
       self.update_column(:catalog_updated_at, Time.now.utc)

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.23"
-end
+  VERSION = "1.4.25"
+end

metadata

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