zuora_connect 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26827913e7bac0f80cbd685cd734d68a135b774e7db4a2f7feb5584a319f5f43
-  data.tar.gz: cc9031915d27d5429ff4108237ee01d76d1d8f6b4b831dfe21d3bdeabaf9d3fe
+  metadata.gz: 3c7cc57c4693daf6ecf48b5453dc251a35b88f2332678b0bfd81bef41c1a82a5
+  data.tar.gz: cb8f3b2f46ec90ecb549d066d4d0495a920805ce6aef6e823fd8c4b2ea120c82
 SHA512:
-  metadata.gz: c30531aa3bde05acf61c252fb98395d47cbabb93182a4fd54c611fd3ee3affbe90da2089d63875b4c67605f30f9f88b5bee1ccd23f89c84b6a0feabb1e01cb5d
-  data.tar.gz: 49f27a50fc5e76f9c365030ef3513c3b71602e8032048dbfb8de533f8a78125133cb47f68e6cb8045297544ae32d0874d09229da4e5438ada87b320098ec245f
+  metadata.gz: 42a71c84a1bd3405a05c6bce8eeac0a4b15447286d714dec543a104f1e32e24caacde2f6dd199f717bd2c9ceb8e53fed80ceeae29f3255f61a56a84b519b46c8
+  data.tar.gz: c5564ce1bf21a8ca495fa2819131d1f22f89a80632d20629e3978c17be2b71a56588db6b51b3165bf271c7925cb4a22049c382a42131c717846c866aa5a33dd7

data/app/models/zuora_connect/app_instance_base.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
   class AppInstanceBase < ActiveRecord::Base
     default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
-    after_create :initialize_redis_placeholder
+    after_create :initialize_redis_placeholders
     before_destroy :prune_data
 
     self.table_name = "zuora_connect_app_instances"
@@ -45,15 +45,25 @@ module ZuoraConnect
       self.apartment_switch(nil, false)
     end
 
-    def initialize_redis_placeholder
+    def initialize_redis_placeholders
       if defined?(Redis.current)
-        Redis.current.zrem("AppInstance:Deleted", id)
-        Redis.current.zadd("APILimits", 9999999999, "placeholder")
-        Redis.current.zadd("InstanceRefreshing", 9999999999, "placeholder")
+        unless Redis.current.zscore("AppInstance:Deleted", "placeholder").present? # O(1)
+          Redis.current.zadd("AppInstance:Deleted", 9_999_999_999, "placeholder") # O(log(N))
+        end
+        Redis.current.zrem("AppInstance:Deleted", self.id) if self.id.present? # O(log(N))
+        unless Redis.current.zscore("APILimits", "placeholder").present? # O(1)
+          Redis.current.zadd("APILimits", 9_999_999_999, "placeholder") # O(log(N))
+        end
+        unless Redis.current.zscore("InstanceRefreshing", "placeholder").present? # O(1)
+          Redis.current.zadd("InstanceRefreshing", 9_999_999_999, "placeholder") # O(log(N))
+        end
       end
       if defined?(Resque.redis)
-        Resque.redis.zadd("PauseQueue", 9999999999, "placeholder")
+        unless Resque.redis.zscore("PauseQueue", "placeholder").present? # O(1)
+          Resque.redis.zadd("PauseQueue", 9_999_999_999, "placeholder") # O(log(N))
+        end
       end
+      true
     end
 
     def prune_data

data/app/views/zuora_connect/static/error_handled.js.erb

@@ -0,0 +1 @@
+$('body').html('<%= escape_javascript render(:file=> "zuora_connect/static/error_handled", :formats => [:html], :locals => local_assigns, :layout => false) %>');

data/app/views/zuora_connect/static/error_unhandled.js.erb

@@ -0,0 +1 @@
+$('body').html('<%= escape_javascript render(:file=> "zuora_connect/static/error_unhandled", :formats => [:html], :locals => local_assigns, :layout => false) %>');

data/lib/zuora_connect/controllers/helpers.rb

@@ -191,6 +191,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
+                session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
                 session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
                 session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
                 session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.23"
+  VERSION = "2.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -309,7 +309,9 @@ files:
 - app/views/layouts/zuora_connect/application.html.erb
 - app/views/sql/refresh_aggregate_table.txt
 - app/views/zuora_connect/static/error_handled.html.erb
+- app/views/zuora_connect/static/error_handled.js.erb
 - app/views/zuora_connect/static/error_unhandled.erb
+- app/views/zuora_connect/static/error_unhandled.js.erb
 - app/views/zuora_connect/static/launch.html.erb
 - config/initializers/apartment.rb
 - config/initializers/aws.rb