zuora_connect 3.0.0.pre.v → 3.0.1.pre.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2de2915f49058f7897da39462cdb21d126e50b6c6be6f4002e2d293849e951
-  data.tar.gz: 793a2abb6ae8c86c1c14f037aa63f55a2d21675ed8133bca1efd17d8dd506d70
+  metadata.gz: 93697b2f6ee9ddb200d9aafcf700e2305740617bbc0a8b216dc32b9fd33a3f2e
+  data.tar.gz: b88d5be07b1122372eb79b9aa74662f06ba3f522a64ba0177f62842db1fe29cc
 SHA512:
-  metadata.gz: eff1f9628eedc98099ea3bfe3071d8e7aeaa281841df391b77c7f507eb82d67eecea83904b78459c8419ec765199c4d8181e4525f07fd874d6f7752b77194780
-  data.tar.gz: f611645b03a5f35c4bf11b77af0017dc7c3b3ea9d5608a521f6defc67b2e359b5ff240d9fe6553a7a23868481b5e073b083ffc2edaba665844692ec241e01ea6
+  metadata.gz: c5bb290ae60c2375e0748a41dc6e8dfdc9b422f2718b24b81759f7985c947050afd0389fefa2d3950d240f1cf3c1f0432bd58aee33c1aa8deed46e46beab6107
+  data.tar.gz: 63703e115fea73c8aa32859719020a68c8e91cee2454260923fae72ebc3bd0e76e30607a526f98238ba8a1c85a828b892d46e99dddf4adea96228d6f2fe60396

data/app/models/concerns/zuora_connect/auditable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ZuoraConnect
+  # Added by @Vina
+  # Description: This automatically stamp user created/updated the record for DataQuery Audit
+  # Usage: add 'include ZuoraConnect::Auditable' to your model.rb that you would like to track
+  module Auditable
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_created_by_id
+      before_update :set_updated_by_id
+
+      private
+
+      def set_created_by_id
+        self.created_by_id = ZuoraUser.current_user_id if defined?(created_by_id)
+      end
+
+      def set_updated_by_id
+        self.updated_by_id = ZuoraUser.current_user_id if defined?(updated_by_id)
+      end
+    end
+  end
+end

data/config/initializers/postgresql_adapter.rb

@@ -10,7 +10,7 @@ module ActiveRecord
 
           return if loaded_from_cache?(initializer)
 
-          if supports_ranges?
+          if Rails::VERSION::MAJOR >= 6 || supports_ranges?
             query = <<-SQL
               SELECT DISTINCT on (t.typname) t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
               FROM pg_type as t

data/lib/zuora_connect.rb

@@ -11,10 +11,8 @@ require 'resque/plugins/custom_logger'
 require 'resque/plugins/app_instance_job'
 require 'metrics/influx/point_value'
 require 'metrics/net'
-require 'zuora_connect/zuora_audit'
 require 'active_record'
 require 'zuora_observability'
-::ActiveRecord::Base.send :include, ZuoraConnect::ZuoraAudit
 
 module ZuoraConnect
   class << self
@@ -31,6 +29,14 @@ module ZuoraConnect
         @logger ||= ZuoraObservability::Logger.custom_logger(name: "Connect", level: Rails.logger.level)
       end
     end
+
+    def app_name
+      if Rails::VERSION::MAJOR >= 6
+        Rails.application.class.module_parent_name
+      else
+        Rails.application.class.parent_name
+      end
+    end
   end
 
   module Controllers
@@ -86,7 +92,7 @@ module ZuoraConnect
       ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
       verify_server_cert: false,
       log_level: Logger::INFO,
-      service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
+      service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : ZuoraConnect.app_name,
       logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: Logger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)

data/lib/zuora_connect/configuration.rb

@@ -43,7 +43,7 @@ module ZuoraConnect
       @dev_mode_access_key_id = nil
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
-      @s3_folder_name = Rails.application.class.parent_name
+      @s3_folder_name = ZuoraConnect.app_name
     end
 
     def private_key

data/lib/zuora_connect/controllers/helpers.rb

@@ -550,11 +550,11 @@ module ZuoraConnect
             final_error = output_xml.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
             session.clear
             if final_error.blank?
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => response.body}))
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response: { params: response.body })
             elsif final_error != "INVALID_SESSION"
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response: { params: final_error })
             else
-              ZuoraConnect.logger.info("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.info("UI Authorization Error", ex, response: { params: final_error })
             end
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
             return

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-v"
-end
+  VERSION = "3.0.1-a"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.v
+  version: 3.0.1.pre.a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -109,7 +109,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: raindrops
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +352,7 @@ files:
 - app/controllers/zuora_connect/static_controller.rb
 - app/helpers/zuora_connect/api/v1/app_instance_helper.rb
 - app/helpers/zuora_connect/application_helper.rb
+- app/models/concerns/zuora_connect/auditable.rb
 - app/models/zuora_connect/app_instance.rb
 - app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
@@ -411,7 +412,6 @@ files:
 - lib/zuora_connect/exceptions.rb
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
-- lib/zuora_connect/zuora_audit.rb
 homepage: 
 licenses: []
 metadata: {}

data/lib/zuora_connect/zuora_audit.rb

@@ -1,31 +0,0 @@
-# Added by @Vina
-# Description: This automatically stamp user created/updated the record for DataQuery Audit
-# Usage: add 'zuora_audit' to your model.rb that you would like to track
-
-module ZuoraConnect
-  module ZuoraAudit
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def zuora_audit
-        include ZuoraConnect::ZuoraAudit::ZuoraAuditInstanceMethods
-        before_create :set_created_by_id
-        before_update :set_updated_by_id
-      end
-    end
-
-    module ZuoraAuditInstanceMethods
-      def set_created_by_id
-        self.created_by_id = current_user_id if defined?(self.created_by_id)
-      end
-
-      def set_updated_by_id
-        self.updated_by_id = current_user_id if defined?(self.updated_by_id)
-      end
-
-      def current_user_id
-        return ZuoraConnect::ZuoraUser.current_user_id
-      end
-    end
-  end
-end