zuora_connect 1.5.40 → 1.5.302

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7121413b5f1a0613786c3de3c859c9a174c340
-  data.tar.gz: 53249355807a2420ede58402a161828c912da299
+  metadata.gz: 70d948ee67b1668d35ba394188ff631af51c7edd
+  data.tar.gz: 07b812c7be3cf5ca81ebd8f24589492f321294b2
 SHA512:
-  metadata.gz: 3395cacd984c09bb2dc5f14f28ff1423d79d4e0cf80a05ac70f5934013d205d5efc216754b5b9d2d1c03a0b61c849e9dc4252e9ecfd12371dcb97721db676a12
-  data.tar.gz: 5b030d3b12c511cd5ec14fad87545e2e4fe43019c42c4d353a483aef2a2aa2f1509298f9e5db399b54d385f77b42667725634206d7eec381c969e1bc46b6f721
+  metadata.gz: 419ab8e60210fb1c908764da9d7f1ba8b6919326dee5af5e565f8c261e27c9608642ef7610a338d89860e566db977df34d248cd020fe2ab543646e86f417b5af
+  data.tar.gz: ccc1f977ff420fd837e41e57d8d84d21532d3a23742862a94bb39404c690e742d9ced481ed0f12009ce2df7cda17a3b013dc43dee38b195d5c856b70c82a40fe

data/app/models/zuora_connect/app_instance_base.rb

@@ -4,13 +4,12 @@ module ZuoraConnect
     after_initialize :init
     self.table_name = "zuora_connect_app_instances"
     attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version
-
+    
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
     INSTANCE_REFRESH_WINDOW = 30.minutes      #Used to set how how long till app starts attempting to refresh cached task connect data
     INSTANCE_REDIS_CACHE_PERIOD = 60.minutes  #Used to determine how long to cached task data will live for
     API_LIMIT_TIMEOUT = 2.minutes             #Used to set the default for expiring timeout when api rate limiting is in effect
-    BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
-
+    
     def init
       @options = Hash.new
       @logins = Hash.new
@@ -18,26 +17,22 @@ module ZuoraConnect
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
-      if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
-        raise "The instance refresh window cannot be greater than the instance cache period"
-      end
-      self.apartment_switch(nil, true)
-    end
-
-    def apartment_switch(method = nil, migrate = false)
-      begin
+      begin 
         Apartment::Tenant.switch!(self.id) if self.persisted?
       rescue Apartment::TenantNotFound => ex
         Apartment::Tenant.create(self.id.to_s)
         retry
       end
-      if migrate && ActiveRecord::Migrator.needs_migration?
+      if(ActiveRecord::Migrator.needs_migration?)
         Apartment::Migrator.migrate(self.id)
       end
+      if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
+        raise "The instance refresh window cannot be greater than the instance cache period"
+      end
       Thread.current[:appinstance] = self
     end
 
-    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false)
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token)
       @api_version = "v2"
       @username = username
       @password = password
@@ -67,31 +62,27 @@ module ZuoraConnect
 
         if session.empty?
           Rails.logger.info("[#{self.id}] REFRESHING - Session Empty")
-          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
-        elsif (self.id != session["appInstance"].to_i)
+        elsif (self.id != session["appInstance"].to_i) 
           Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})")
-          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
         elsif session["#{self.id}::task_data"].blank?
           Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank")
-          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
         elsif session["#{self.id}::last_refresh"].blank?
-          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie")
-          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
+          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") 
           self.refresh(session)
 
-        # If the cache is expired and we can aquire a refresh lock
-        elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
+        elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && !self.marked_for_refresh?
           Rails.logger.info("[#{self.id}] REFRESHING - Session Old by #{time_expire.abs} second")
+          self.mark_for_refresh #We will mark that we are refreshing the expired session. This will help prevent race condition between multiple requests
           self.refresh(session)
         else
           if time_expire < 0
-            Rails.logger.info(["[#{self.id}] REBUILDING - Expired by #{time_expire} seconds", self.marked_for_refresh? ? " cache updating as of #{self.reset_mark_refreshed_at} seconds ago" : nil].compact.join(','))
+            Rails.logger.info(["[#{self.id}] REBUILDING - Expired by #{time_expire} seconds", self.marked_for_refresh? ? " cache updating as of #{self.refreshed_at} seconds ago" : nil].compact.join(','))
           else
             Rails.logger.info("[#{self.id}] REBUILDING - Expires in #{time_expire} seconds")
           end
@@ -101,18 +92,11 @@ module ZuoraConnect
       begin
         I18n.locale = self.locale
       rescue I18n::InvalidLocale => ex
-        Rails.logger.debug("Invalid Locale: #{ex.message}")
+        Rails.logger.error("Invalid Locale: #{ex.message}")
       end
       Time.zone = self.timezone
+      Thread.current[:appinstance] = self
       return self
-    rescue ZuoraConnect::Exceptions::HoldingPattern => ex
-      while self.marked_for_refresh?
-        Rails.logger.info("[#{self.id}] Holding - Expires in #{self.reset_mark_expires_at}")
-        sleep(5)
-      end
-      self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
-      session = self.data_lookup(session: session)
-      retry
     end
 
     def refresh(session = nil)
@@ -122,71 +106,60 @@ module ZuoraConnect
       response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
       response_time = Time.now - start
 
-      Rails.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+      Rails.logger.info("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
       if response.code == 200
-        build_task(JSON.parse(response.body), session)
         @last_refresh = Time.now.to_i
-        self.cache_app_instance
-        self.reset_mark_for_refresh
+
+        build_task(JSON.parse(response.body), session)
       else
-        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed Code #{response.code}")
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
       if (refresh_count += 1) < 3
-        Rails.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else
-        Rails.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
-        Rails.logger.info("[#{self.id}] REFRESH TASK - Failed Retrying(#{refresh_count})")
         if ex.code == 401
           self.refresh_oauth
         end
         retry
       else
-        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
         raise
       end
     end
 
     #### START Task Mathods ####
       def build_task(task_data, session)
-        begin
-          @task_data = task_data
-          @mode = @task_data["mode"]
-          @task_data.each do |k,v|
-            if k.match(/^(.*)_login$/)
-              tmp = ZuoraConnect::Login.new(v)
-              if !session.nil? && v["tenant_type"] == "Zuora"
-                if tmp.entities.size > 0
-                  tmp.entities.each do |value|
-                    entity_id = value["id"]
-                    tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
-                  end
-                else
-                  tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
+        @task_data = task_data
+        @mode = @task_data["mode"]
+        @task_data.each do |k,v|
+          if k.match(/^(.*)_login$/)
+            tmp = ZuoraConnect::Login.new(v)
+            if !session.nil? && v["tenant_type"] == "Zuora"
+              if tmp.entities.size > 0
+                tmp.entities.each do |value|
+                  entity_id = value["id"]
+                  tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
                 end
+              else
+                tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
               end
-              @logins[k] = tmp
-              self.attr_builder(k, @logins[k])
-            elsif k == "options"
-              v.each do |opt|
-                @options[opt["config_name"]] = opt
-              end
-            elsif k == "user_settings"
-              self.timezone =  v["timezone"]
-              self.locale = v["local"]
             end
+            @logins[k] = tmp
+            self.attr_builder(k, @logins[k])
+          elsif k == "options"
+            v.each do |opt|
+              @options[opt["config_name"]] = opt
+            end
+          elsif k == "user_settings"
+            self.timezone =  v["timezone"]
+            self.locale = v["local"]
           end
-        rescue => ex
-          Rails.logger.error("Task Data: #{task_data}")
-          Rails.logger.error("Task Session: #{session.to_hash}")
-          raise
         end
+        Thread.current[:appinstance] = self
       end
 
       def updateOption(optionId, value)
@@ -197,17 +170,10 @@ module ZuoraConnect
       #EXAMPLE: {"name": "ftp_login_14","username": "ftplogin7","tenant_type": "Custom","password": "test2","url": "www.ftp.com","custom_data": {  "path": "/var/usr/test"}}
       def update_logins(options)
         update_login_count ||= 0
+
         response = HTTParty.post(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}/logins",:body => {:access_token => self.username}.merge(options))
-        parsed_json =  JSON.parse(response.body)
         if response.code == 200
-          if defined?(Redis.current)
-            self.build_task(parsed_json, self.data_lookup)
-            self.last_refresh = Time.now.to_i
-            self.cache_app_instance
-          end
-          return parsed_json
-        elsif response.code == 400
-          raise ZuoraConnect::Exceptions::APIError.new(message: parsed_json['errors'].join(' '), response: response.body, code: response.code)
+          return JSON.parse(response.body)
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
@@ -232,14 +198,12 @@ module ZuoraConnect
     #### START Connect OAUTH methods ####
       def check_oauth_state(method)
         #Refresh token if already expired
-        if self.oauth_expired?
-          Rails.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
-          self.refresh_oauth
-        end
+        Rails.logger.debug("[#{self.id}] Before '#{method}' method check Oauth state")
+        self.refresh_oauth if self.oauth_expired?
       end
 
       def oauth_expired?
-        return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now) : true
+        (self.oauth_expires_at < Time.now)
       end
 
       def refresh_oauth
@@ -268,21 +232,15 @@ module ZuoraConnect
         end
       rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
         if (refresh_oauth_count += 1) < 3
-          Rails.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
         else
-          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-        sleep(5)
-        self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token]) #Reload only the refresh token for retry
-
-        #After reload, if nolonger expired return
-        return if !self.oauth_expired?
-
         if (refresh_oauth_count += 1) < 3
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
+          sleep(5)
+          self.reload_attributes([:refresh_token]) #Refload only the refresh token for retry
           retry
         else
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
@@ -300,16 +258,12 @@ module ZuoraConnect
         Redis.current.del("AppInstance:#{self.id}:Refreshing") if defined?(Redis.current)
       end
 
-      def reset_mark_refreshed_at
+      def refreshed_at
         return defined?(Redis.current) ? REFRESH_TIMEOUT.to_i - Redis.current.ttl("AppInstance:#{self.id}:Refreshing") : 0
       end
 
-      def reset_mark_expires_at
-        return defined?(Redis.current) ? Redis.current.ttl("AppInstance:#{self.id}:Refreshing") : 0
-      end
-
-      def mark_for_refresh
-        return defined?(Redis.current) ? Redis.current.set("AppInstance:#{self.id}:Refreshing", true, {:nx => true, :ex => REFRESH_TIMEOUT.to_i}) : true
+      def mark_for_refresh        
+        Redis.current.setex("AppInstance:#{self.id}:Refreshing", REFRESH_TIMEOUT.to_i, true) if defined?(Redis.current)
       end
 
       def data_lookup(session: {})
@@ -320,10 +274,10 @@ module ZuoraConnect
           cached_instance = Redis.current.get("AppInstance:#{self.id}")
           if cached_instance.blank?
             Rails.logger.debug("[#{self.id}] Cached AppInstance Missing")
-            return session
+            return  session
           else
             Rails.logger.debug("[#{self.id}] Cached AppInstance Found")
-            return decrypt_data(data: cached_instance, rescue_return: session)
+            return decrypt_data(data: cached_instance, rescue_return: {})
           end
         else
           return session
@@ -332,11 +286,7 @@ module ZuoraConnect
 
       def cache_app_instance
         if defined?(Redis.current)
-          #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
-          if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
-            Rails.logger.info("[#{self.id}] Caching AppInstance")
-            Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, encrypt_data(data: self.save_data))
-          end
+          Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, encrypt_data(data: self.save_data))
           Redis.current.del("Deleted:#{self.id}")
         end
       end
@@ -353,17 +303,7 @@ module ZuoraConnect
             end
           end
         end
-
         session["#{self.id}::task_data"] = self.task_data
-
-        #Redis is not defined strip out old data
-        if !defined?(Redis.current)
-          session["#{self.id}::task_data"].delete('applications')
-          session["#{self.id}::task_data"].select {|k,v| k.include?('login') && v['tenant_type'] == 'Zuora'}.each do |login_key, login_data|
-            session["#{self.id}::task_data"][login_key]['entities'] = (login_data.dig('entities') || []).map {|entity| entity.slice('id', 'tenantId')}
-          end
-        end
-
         session["#{self.id}::last_refresh"] = self.last_refresh
         session["appInstance"] = self.id
         return session
@@ -440,11 +380,9 @@ module ZuoraConnect
 
     ### START Catalog Helping Methods #####
       def get_catalog(page_size: 5, zuora_login: self.login_lookup(type: "Zuora").first, entity_id: nil)
-        self.update_column(:catalog_update_attempt_at, Time.now.utc)
-
         entity_reference = entity_id.blank? ? 'Default' : entity_id
-        Rails.logger.debug("Fetch Catalog")
-        Rails.logger.debug("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
+        Rails.logger.info("Fetch Catalog")
+        Rails.logger.info("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
 
         login = zuora_login.client(entity_reference)
 
@@ -526,7 +464,7 @@ module ZuoraConnect
           raise "Object Id can only be a string or an array of strings"
         end
 
-        if defined?(Redis.current) && object_id.present? && object_id.class == String && object_id.present?
+        if defined?(Redis.current) && object_id.present? && object_id.class == String
           stub_catalog = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}"))
           object_hierarchy = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Hierarchy"))
         end
@@ -537,7 +475,7 @@ module ZuoraConnect
 
         case object
         when :product
-          if object_id.nil?
+          if object_id.blank?
             string =
               "SELECT "\
                 "json_object_agg(product_id, product #{child_objects ? '' : '- \'productRatePlans\''}) AS item "\
@@ -554,7 +492,7 @@ module ZuoraConnect
                 "FROM "\
                   "\"public\".\"zuora_connect_app_instances\" "\
                 "WHERE "\
-                  "\"id\" = %s" % [entity_reference, object_id.blank? ? BLANK_OBJECT_ID_LOOKUP : object_id, self.id]
+                  "\"id\" = %s" % [entity_reference, object_id, self.id]
             elsif object_id.class == Array
               string =
                 "SELECT "\
@@ -569,7 +507,7 @@ module ZuoraConnect
           end
 
         when :rateplan
-          if object_id.nil?
+          if object_id.blank?
             string =
               "SELECT "\
                 "json_object_agg(rateplan_id, rateplan #{child_objects ? '' : '- \'productRatePlanCharges\''}) AS item "\
@@ -587,7 +525,7 @@ module ZuoraConnect
                 "FROM "\
                   "\"public\".\"zuora_connect_app_instances\" "\
                 "WHERE "\
-                  "\"id\" = %s" % [entity_reference, object_hierarchy['productId'], object_id.blank? ? BLANK_OBJECT_ID_LOOKUP : object_id,  self.id]
+                  "\"id\" = %s" % [entity_reference, object_hierarchy['productId'], object_id,  self.id]
             elsif object_id.class == Array
               string =
                 "SELECT "\
@@ -603,7 +541,7 @@ module ZuoraConnect
           end
 
         when :charge
-          if object_id.nil?
+          if object_id.blank?
             string =
               "SELECT "\
                 "json_object_agg(charge_id, charge) as item "\
@@ -622,7 +560,7 @@ module ZuoraConnect
                 "FROM "\
                   "\"public\".\"zuora_connect_app_instances\" "\
                 "WHERE "\
-                  "\"id\" = %s" % [entity_reference, object_hierarchy['productId'], object_hierarchy['productRatePlanId'], object_id.blank? ? BLANK_OBJECT_ID_LOOKUP : object_id , self.id]
+                  "\"id\" = %s" % [entity_reference, object_hierarchy['productId'], object_hierarchy['productRatePlanId'], object_id, self.id]
 
             elsif object_id.class == Array
               string =
@@ -644,7 +582,7 @@ 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?
+        if defined?(Redis.current) && object_id.present? && object_id.class == String
           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
         end
@@ -677,7 +615,7 @@ module ZuoraConnect
     ### END S3 Helping Methods #####
 
     ### START Aggregate Grouping Helping Methods ####
-      def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true)
+      def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true) 
         self.update_functions
         #Broke function into two parts to ensure transaction size was small enough
         ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Table\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
@@ -689,18 +627,6 @@ module ZuoraConnect
       end
     ### END Aggregate Grouping Helping Methods #####
 
-    # Overide this method to avoid the new session call for api requests that use the before filter authenticate_app_api_request.
-    # This can be usefull for apps that dont need connect metadata call, or credentials, to operate for api requests
-    def new_session_for_api_requests(params: {})
-      return true
-    end
-
-    # Overide this method to avoid the new session call for ui requests that use the before filter authenticate_connect_app_request.
-    # This can be usefull for apps that dont need connect metadata call, or credentials, to operate for ui requests
-    def new_session_for_ui_requests(params: {})
-      return true
-    end
-
     def reload_attributes(selected_attributes)
       raise "Attibutes must be array" if selected_attributes.class != Array
       value_attributes = self.class.unscoped.where(:id=>id).select(selected_attributes).first.attributes
@@ -745,6 +671,5 @@ module ZuoraConnect
     end
 
     method_hook :refresh, :updateOption, :update_logins, :before => :check_oauth_state
-    method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end
 end

data/config/initializers/redis.rb

@@ -1,6 +1,6 @@
-redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : defined?(Rails.application.secrets.redis) ? Rails.application.secrets.redis : 'redis://localhost:6379/1'
+redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : 'redis://localhost:6379/1'
 if defined?(Redis.current)
-  Redis.current = Redis.new(:url => redis_url, :timeout => 10, :reconnect_attempts => 2)
+  Redis.current = Redis.new(:url => redis_url, :timeout => 10)
   if defined?(Resque.redis)
     Resque.redis = Redis.current
   end

data/lib/resque/dynamic_queues.rb

@@ -38,29 +38,18 @@ module Resque
     end
 
     def reserve_with_round_robin
-      grouped_queues = queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
-
-      #Instance queue grouping
-      if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
-        @n ||= 0
-        @n += 1
-        @n = @n % grouped_queues.keys.size
-
-        grouped_queues.keys.rotate(@n).each do |key|
-          grouped_queues[key].each do |queue|
-            log! "Checking #{queue}"
-            if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
-              log! "Found job on #{queue}"
-              return @job_in_progress
-            end
-          end
-          @n += 1 # Start the next search at the queue after the one from which we pick a job.
+      qs = rotated_queues
+      qs.each do |queue|
+        log! "Checking #{queue}"
+        if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
+          log! "Found job on #{queue}"
+          return @job_in_progress
         end
-        nil
-      else 
-        return reserve_without_round_robin
+        # Start the next search at the queue after the one from which we pick a job.
+        @n += 1
       end
-      
+
+      nil
     rescue Exception => e
       log "Error reserving job: #{e.inspect}"
       log e.backtrace.join("\n")
@@ -90,7 +79,7 @@ module Resque
 
       #Remove Queues under Api Limits
       api_limit_instances = Redis.current.keys('APILimits:*').map {|key| key.split('APILimits:').last.to_i}
-      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)} ## 2
+      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
       
       #Queue Pausing 
       paused_instances = Redis.current.keys('resque:PauseQueue:*').map {|key| key.split('resque:PauseQueue:').last.to_i}

data/lib/zuora_connect/controllers/helpers.rb

@@ -6,7 +6,6 @@ module ZuoraConnect
 
       def authenticate_app_api_request
         #Skip session for api requests
-        Thread.current[:appinstance] = nil
         request.session_options[:skip] = true
         start_time = Time.now
         if request.headers["API-Token"].present?
@@ -25,8 +24,8 @@ module ZuoraConnect
       end
 
       def authenticate_connect_app_request
-        Thread.current[:appinstance] = nil
         start_time = Time.now
+
         if ZuoraConnect.configuration.mode == "Production"
           if request["data"]
             setup_instance_via_data
@@ -39,9 +38,7 @@ module ZuoraConnect
         #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis 
         #so data lookup provides a model method that can be overriden per app.
         if params[:controller] != 'zuora_connect/api/v1/app_instance' && params[:action] != 'drop'
-          if @appinstance.new_session_for_ui_requests(:params => params)
-            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
-          end
+          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
         end
         PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail) && session["#{@appinstance.id}::user::email"].present? 
         begin
@@ -55,7 +52,7 @@ module ZuoraConnect
 
       def persist_connect_app_session
         if @appinstance.present?
-          if defined?(Redis.current)
+          if defined?(Redis.current) && Rails.application.config.session_store.to_s == "RedisSessionStore"
             @appinstance.cache_app_instance
           else
             session.merge!(@appinstance.save_data)
@@ -150,9 +147,7 @@ module ZuoraConnect
       #API ONLY
       def check_instance
         if @appinstance.present?
-          if @appinstance.new_session_for_api_requests(:params => params)
-            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
-          end
+          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
           Thread.current[:appinstance] = @appinstance
           PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
           return true

data/lib/zuora_connect/exceptions.rb

@@ -1,7 +1,5 @@
 module ZuoraConnect
   module Exceptions
-
-    class HoldingPattern < StandardError; end
     class Error < StandardError; end
     class AuthorizationNotPerformed < Error; end
 
@@ -34,23 +32,6 @@ module ZuoraConnect
       end
     end
 
-    class APIError < Error
-      attr_reader :code, :response
-      attr_writer :default_message
-
-      def initialize(message: nil,response: nil, code: nil)
-        @code = code
-        @message = message
-        @response = response
-        @default_message = "Connect update error."
-      end
-
-      def to_s
-        @message || @default_message
-      end
-
-    end
-
     class AccessDenied < Error
       attr_writer :default_message
 

data/lib/zuora_connect/railtie.rb

@@ -23,7 +23,7 @@ module ZuoraConnect
         Rails.configuration.lograge.custom_options = lambda do |event|
           exceptions = %w(controller action format id)
           {
-            appinstance_id: Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0,
+            appinstance_id: Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : "Unknown",
             params: event.payload[:params].except(*exceptions),
             exception: event.payload[:exception],
             exception_object: event.payload[:exception_object]

data/lib/zuora_connect/version.rb

@@ -1,3 +1,4 @@
 module ZuoraConnect
-  VERSION = "1.5.40"
+  VERSION = "1.5.302"
 end
+ 

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.40
+  version: 1.5.302
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
@@ -35,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
@@ -45,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
@@ -182,20 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: derailed
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +225,6 @@ files:
 - db/migrate/20110503003602_add_catalog_data_to_app_instance.rb
 - db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb
 - db/migrate/20110503003604_catalog_default.rb
-- db/migrate/20180301052853_add_catalog_attempted_at.rb
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
 - lib/resque/self_lookup.rb
@@ -329,44 +302,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/models/zuora_connect/app_instance_test.rb
+- test/test_helper.rb
+- test/fixtures/zuora_connect/app_instances.yml
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/dummy/bin/rake
+- test/integration/navigation_test.rb
+- test/zuora_connect_test.rb
+- test/dummy/Rakefile
+- test/dummy/bin/rails
 - test/dummy/bin/bundle
 - test/dummy/bin/setup
-- test/dummy/bin/rails
-- test/dummy/Rakefile
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/bin/rake
 - test/dummy/README.rdoc
-- test/dummy/config.ru
 - test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
 - test/dummy/config/environment.rb
-- test/dummy/config/database.yml
 - test/dummy/config/secrets.yml
+- test/dummy/config/database.yml
+- test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/application.rb
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
-- test/test_helper.rb
-- test/fixtures/zuora_connect/app_instances.yml
-- test/integration/navigation_test.rb
-- test/models/zuora_connect/app_instance_test.rb
-- test/zuora_connect_test.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/routes.rb
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/404.html
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/config.ru

data/db/migrate/20180301052853_add_catalog_attempted_at.rb

@@ -1,5 +0,0 @@
-class AddCatalogAttemptedAt < ActiveRecord::Migration
-  def change
-    add_column :zuora_connect_app_instances, :catalog_update_attempt_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_update_attempt_at
-  end
-end