zuora_connect 3.1.0.pre.a → 3.1.0.pre.d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bfbbb07eb966a69d84820c47abc61d68930e326962a7254fbaff709fc5e734f
-  data.tar.gz: 8f964b17242b8db5ec83bf8bd70d5ec113bd4f6dabbfefac8005548a079b0272
+  metadata.gz: 8a5ca7980f0c3e5418bbd8b34d277421c00bbe709870ca1f17088c16e65a7454
+  data.tar.gz: 5465170884c82258888725799568a8d43e70ddceb968652c284335397023875f
 SHA512:
-  metadata.gz: 9240e5e7e344b0886407c9eb90abcc0a464c1d0a86daba0043871844003f954a3b9748086b21169f01d4e696428188181bb5d35feb38ebb75f804f9e862ff2df
-  data.tar.gz: 365883658d6fe47b2996f35bd2382380788983d9564378930864031361b42ce58efd6a46a65b7341313e7d9c0b9f6afcc180ad28f4b2540862155003ced1ca03
+  metadata.gz: 623b63683caba7ac18d08da2fba2b9d5db96eb24b9d0e0b833b85d4d707a2f2c34f1dc687248b9e034271cae4a4f402e0a78ce227cecfbbf9e467de07189771f
+  data.tar.gz: 2f27d2fe72ad6abe199a49b8872c6ed1e581257d62a62576452331e215f46f48ec17a88c13d75491573c27a71d151d3c1b0bb2f9258d3e1cd458213ed3f5b1b4

data/app/controllers/zuora_connect/api/v1/app_instance_controller.rb

@@ -43,7 +43,12 @@ module ZuoraConnect
 
     def cache_bust
       if defined?(Redis.current)
+        @appinstance.fetch_connect_data   #Fetch data and set in database if kms key is used
+        @appinstance.cache_app_instance(force_cache: true)  #Update cache in redis
         Redis.current.del("AppInstance:#{@appinstance.id}")
+        @appinstance.cache_app_instance(force_cache: true)  #Update cache in redis
+        #TODO: Could be a chance another thread cache back to old value, but will eventually cache will get consitent, move to nolonger needing redis cache
+
         respond_to do |format|
           format.json {render json: {}, status: :ok}
         end

data/app/models/zuora_connect/app_instance_base.rb

@@ -351,28 +351,33 @@ module ZuoraConnect
       self.id >= 25000000
     end
 
+    def fetch_connect_data
+      self.check_oauth_state
+      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
+
+      if response.code == 200
+        begin
+          parsed_json = JSON.parse(response.body)
+        rescue JSON::ParserError => ex
+          raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
+        end
+
+        self.build_task(task_data: parsed_json, session: session)
+        self.set_backup_creds
+        self.save(validate: false) if self.changed?
+      else
+        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
+      end
+    end
+
+
     def refresh(session: {})
       refresh_count ||= 0
       skip_connect ||= ZuoraConnect.configuration.skip_connect
       begin
         #Check how app was deployed
-        if !self.auto_deployed? && !skip_connect
-          self.check_oauth_state
-          response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
-
-          if response.code == 200
-            begin
-              parsed_json = JSON.parse(response.body)
-            rescue JSON::ParserError => ex
-              raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
-            end
-
-            self.build_task(task_data: parsed_json, session: session)
-            self.set_backup_creds
-            self.save(validate: false) if self.changed?
-          else
-            raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
-          end
+        if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
+          self.fetch_connect_data
         else
           self.build_task(task_data: self.zuora_logins, session: session)
         end
@@ -775,10 +780,10 @@ module ZuoraConnect
         Redis.current.del("AppInstance:#{self.id}")
       end
 
-      def cache_app_instance
+      def cache_app_instance(force_cache: false)
         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)
+          if self.task_data.present? &&  ((self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i ) || force_cache)
             ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end

data/config/initializers/postgresql_adapter.rb

@@ -11,7 +11,7 @@ module ActiveRecord
           additional_types = []
           load_types_queries(initializer, oids) do |query|
             execute_and_clear(query, "SCHEMA", []) do |records|
-              additional_types.push(records)
+              additional_types.push(records.to_a)
               initializer.run(records)
             end
           end
@@ -98,7 +98,19 @@ module ActiveRecord
             begin
               if Redis.current.exists(SCHEMA_ADDITIONAL_TYPES)
                 additional_types = JSON.parse(Redis.current.get(SCHEMA_ADDITIONAL_TYPES))
-                if additional_types.is_a?(Array)
+
+                rails_version = Rails.version.split('.').map { |x| x.to_i }
+                if (rails_version <=> [7, 0, 0]) >= 1
+                  if additional_types.is_a?(Array) && !additional_types.first.is_a?(Array)
+                    raise 'incompatible cache version'
+                  end
+                elsif (rails_version <=> [5, 2, 0]) >= 1
+                  if additional_types.is_a?(Array) && additional_types.first.is_a?(Array)
+                    raise 'incompatible cache version'
+                  end
+                end
+
+                if additional_types.is_a?(Array) && additional_types.first.is_a?(Array)
                   additional_types.each { |additional_type| initializer.run(additional_type) }
                 else
                   initializer.run(additional_types)
@@ -106,6 +118,7 @@ module ActiveRecord
                 return true
               end
             rescue => ex
+              Redis.current.del(SCHEMA_ADDITIONAL_TYPES)
               Rails.logger.warn('Exception occurred while loading additional types', ex)
             end
           end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.0-a"
+  VERSION = "3.1.0-d"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.a
+  version: 3.1.0.pre.d
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment