zuora_connect 1.7.20 → 1.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dd5a2b3b66e4bd5c43e2b9625c05ec541193c6f
-  data.tar.gz: d292c7ab56c4b2038a93b0135845f8ad3c712bcb
+  metadata.gz: e2042593e49d99996fc3e0b4bb62d1fa715321da
+  data.tar.gz: c55c2a56f9402c714aae9db0df016b7b6506a1b1
 SHA512:
-  metadata.gz: 8c3d103ea50e585639abe9fab959091cfc073ebf43ec756d64139c6839e491f0df7256de9a3a0e5dc997245da5853394573a6183b723302463d5526980221f67
-  data.tar.gz: 8b94cc8937dff2f6f5e73667cf04706bd835c3479b37701453287227c7e8c2884ed4fb7f5b17b1243288f66705fccd9a8ef12dbdaca64fc306035c54115c1293
+  metadata.gz: 54ae6b380c40d45ffe40724abf11ac1e4a8bbc39e3028d4e882e726e44dc9df446bc622dab6c85e958be2e453642926bd7512c06d937116de1733b7b6bdeb696
+  data.tar.gz: 4ecbc935e1b59f17ba947c430f4f4ad84c7c9122ca0558664ce60d42311033fe72a19283346414c2f3701e8c7c0a74ea50c1d4f6b95c047656f76753dd29009b

data/app/models/zuora_connect/app_instance_base.rb

@@ -556,9 +556,8 @@ module ZuoraConnect
         # 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
+          catalog_keys = Redis.current.smembers("Catalog:#{self.id}:Keys")
+          Redis.current.del(catalog_keys.push("Catalog:#{self.id}:Keys"))
         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})
@@ -593,7 +592,7 @@ module ZuoraConnect
         end
 
         if defined?(Redis.current) && object_id.present? && object_id.class == String && object_id.present?
-          stub_catalog = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}"))
+          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"))
         end
 
@@ -711,9 +710,16 @@ module ZuoraConnect
         stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute(string).first["item"] || "{}")
 
         if defined?(Redis.current) && object_id.present? && object_id.class == String && object_id.present?
-          Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
-          Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(data: stub_catalog))  if cache
+          if cache
+            Redis.current.sadd("Catalog:#{self.id}:Keys", ["Catalog:#{self.id}:#{object_id}:Hierarchy", "Catalog:#{self.id}:#{object_id}:Children:#{child_objects}"])
+            Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
+            Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(data: stub_catalog)) 
+          else
+            Redis.current.sadd("Catalog:#{self.id}:Keys", ["Catalog:#{self.id}:#{object_id}:Hierarchy"])
+            Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
+          end
         end
+
         return stub_catalog
       end
     ### END Catalog Helping Methods #####

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.20"
+  VERSION = "1.7.21"
 end

metadata

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