zuora_connect 3.1.0.pre.b → 3.1.0.pre.e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab5ac57e2b7a00d075bbc96d9ab724f4bdc6c5ca457469f857eab9db1a7f876
-  data.tar.gz: c4ff526e3ec38ae3bff4a6d3ed1faaf94f45523ec0b59cb46bcfaada4b9aaaca
+  metadata.gz: 5214f01edfd6d5be196318459c718b0b654ddf9d94b658860fd5595f834ff59a
+  data.tar.gz: 0a718fed463c71a7723897f673dd40c2facc742a205b2851f6ede90e20e796da
 SHA512:
-  metadata.gz: 150b9b6d81620dbf8005f878ceac204b199009723462e449a8ef7f5498a78244178ddd34cd4ec6a6f6d64b3806e177451f2816576ebfe849ea411b344d1c7c0e
-  data.tar.gz: f7aaa7a5b6cd2e86aa109615c46964268ed3b7e598512ea7f3cbf4f24ddbee6a714b47f7c631aae02d83e16d8219e2b6c3672370ffe49323dfed5169cb3f4456
+  metadata.gz: 3a51ece01655985f0e699eaf0550b0f87f6af2f43dc3ae015982aa6674113e77216d68fc21f98811d6b13ec930e9db01d4e8ab28814be04f2210e11df91c3183
+  data.tar.gz: 91500dc84ef5cd15efd160cbb885eb022b3861677e66e28f276a37e0a025d27fdbbb4615bff4f1bf8378e2413935fe7ba418b72a9f806b7167f7876e3b6ec470

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(session: {})
+      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(session: session)
         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

@@ -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-b"
+  VERSION = "3.1.0-e"
 end

metadata

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