zuora_connect 2.0.57k → 2.0.57p

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e465e3eb7a8baeebe136ee95418b56acd7e4fe2952c82469f3a457f528fadb1
-  data.tar.gz: 7cc23037896d083ea8ea23a1d1e7fb81a04d21e19731171879f2db750cb1f399
+  metadata.gz: 52deb8dab9ab286cbebb70f76bf2a7baa6a0531c9a4dc30a0ff595ed5fe473bc
+  data.tar.gz: 50193876865b0b41c7ac42799ecfed555c5f9b246cdd0274c3fbf35ba521cd47
 SHA512:
-  metadata.gz: df9a0b5b8c2448fcdda8d13c67b0998c17f46ce84452494b3d1db543a04a517d9515b2c65c3d057344ed1c118544b53d472de1504f2f4d2f60e0114cdbfb8912
-  data.tar.gz: 0573374e27adb8d81fbd2786c707b784b93eac71f1a70668316ca83e5af14831dc76dc213ac8372bf4fecd57d9667ba5c8a38c30c81a1850f2c1729fc5e5474b
+  metadata.gz: a502ab3c95acc1b05cebb4611374b8e2a5ed60859fbe5c3a8185ff1b9c802685722b97850a60243a77564faf55e20e19735dc8b42f82cc5b6c1d30e8162d2e34
+  data.tar.gz: 85c040a0bc92c2670917b89898cdfb3c29a45c3ad8be529c24a6e0dea0488f2f7b891a15ef22536a76268d3b01f97fafe247b0eefbe8bf2a1f1df745d1307a69

data/app/assets/javascripts/hallway_wrapper/after.js

@@ -15,8 +15,11 @@ if (isHallway()) {
 }
 
 function isHallway() {
-  var regex = new RegExp("^/services/");
-  return window.location.pathname.match(regex);
+  var regex = new RegExp("(?<=\\/)services\\/.*");
+  if (regex.test(window.location.pathname)) {
+    return window.location.pathname.match(regex)[0]
+  }
+  return null;
 }
 
 function deleteAllCookies() {

data/app/models/zuora_connect/app_instance_base.rb

@@ -210,7 +210,7 @@ module ZuoraConnect
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
+        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'", self.default_ougai_items)
         sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
@@ -219,7 +219,7 @@ module ZuoraConnect
     rescue ZuoraConnect::Exceptions::MissMatch => ex
       self.delete_app_instance
       session = {}
-      ZuoraConnect.logger.error(ex, app_instance_id_new: self.task_data['id'])
+      ZuoraConnect.logger.error(ex, app_instance_id_new: self.task_data['id'], self.default_ougai_items)
       retry
     rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
       raise
@@ -229,7 +229,7 @@ module ZuoraConnect
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
-        ZuoraConnect.logger.error("Failed new session", ex)
+        ZuoraConnect.logger.error("Failed new session", ex, self.default_ougai_items)
         raise
       end
     ensure
@@ -1121,6 +1121,15 @@ module ZuoraConnect
       # Data from each schema will be loaded into table(aggregate_name) into the public schema
       def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true, ignore_indexes: [])
         self.update_functions
+
+        sql_result = ActiveRecord::Base.connection.execute <<-eos
+          SELECT pid, relname, mode
+          FROM pg_locks l
+          JOIN pg_class t ON l.relation = t.oid AND t.relkind = 'r'
+          WHERE t.relname = '#{aggregate_name}' AND l.mode ='AccessExclusiveLock';
+        eos
+        raise ZuoraConnect::Exceptions::Error.new("An existing lock detected while dropping table '#{aggregate_name}'") if sql_result.count > 0
+
         if index_table
           ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\', \'{%s}\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause), ignore_indexes.map { |index| "\"#{index}\"" }.join(',')])
         else

data/lib/zuora_connect/controllers/helpers.rb

@@ -316,17 +316,21 @@ module ZuoraConnect
                     }, :layout => false
                     return
                   end
-                  ZuoraConnect::Exceptions::APIError.new(message: "#{app_env} navbar url was blank", response: response)
+                  raise ZuoraConnect::Exceptions::APIError.new(message: "#{app_env} navbar url was blank", response: response)
                 else
-                  begin
-                    task_ids = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(url).query)["app_instance_ids"][0]))
-                  rescue => ex
-                    raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                  query_params = CGI.parse(URI.parse(url).query)
+                  app_instance_ids = query_params["app_instance_ids"][0]
+                  if app_instance_ids.present?
+                    begin
+                      task_ids = JSON.parse(Base64.urlsafe_decode64(app_instance_ids))
+
+                      appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
+                    rescue => ex
+                      raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                    end
                   end
                 end
-                appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
-              else
-                appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
+                appinstances ||= ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
               end
             end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57k"
+  VERSION = "2.0.57p"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57k
+  version: 2.0.57p
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment