istox 0.1.157.8 → 0.1.158.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b20a5f70bdafe311ffc02576324bed01c75d2ae6a95d93d8ced8a3ff6faf38af
-  data.tar.gz: fae479809eb6517be5c67cfc79125059f74cfe00978fee53ee219ce31bce0edd
+  metadata.gz: 4fd4361212a6baa9b4f3c29c5c5b0bfcef7b5aecf669c29d9ed5ddcfc5d0f446
+  data.tar.gz: 71cb99709647bb1f9cc867b685c51263b2fd185c383e355461a67b47fe255e3b
 SHA512:
-  metadata.gz: 627932e0f956f2b7bb2819ecb589606d33cdd74191df07a862ca91c78cff61c3809f2c881a906c0af19cfd8bb758a2904e66846a4bd19a88928cbb04c367fd02
-  data.tar.gz: 89cce563fe2225b1f0aaa23e604a737ef774145f68f19c75bc04f5105bbe7afa942c3058ceed369a8242c27c5e6e50aa637975d0d35f6f4ee97c0f236f3c71ae
+  metadata.gz: b488267ae4edf9ef90a6cf6921c7b0d0ca97e5e2f1633475610a27782f6da5fb26ac5ce35b17e45c42fecfc78c883eedbff1b1702ff8d3436314cf8b52bdb115
+  data.tar.gz: c870f1aaadaa9868e1d17cafe3f83e43f816469bd2ef8af072012df7a0fdf3022b27ca6065e30ce7833c18cb370b7f595c4bcb55e81b367dbb2f957cc48fa695

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.157.5)
+    istox (0.1.157.9)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -86,14 +86,13 @@ GEM
     aws-xray-sdk (0.11.4)
       aws-sdk-xray (~> 1.4.0)
       multi_json (~> 1)
-    bigdecimal (2.0.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     bullet (5.7.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    bunny (2.16.1)
+    bunny (2.17.0)
       amq-protocol (~> 2.3, >= 2.3.1)
     byebug (11.1.3)
     coderay (1.1.2)
@@ -127,14 +126,14 @@ GEM
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.3)
+    graphql (1.11.4)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.31.1-universal-darwin)
-      google-protobuf (~> 3.12)
+    grpc (1.32.0-universal-darwin)
+      google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.31.1)
+    grpc-tools (1.32.0)
     gruf (2.8.1)
       activesupport (> 4)
       concurrent-ruby (> 1)
@@ -171,8 +170,7 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.9)
-      bigdecimal (~> 2.0)
+    oj (3.10.14)
     ougai (1.8.5)
       oj (~> 3.10)
     paranoia (2.4.2)

data/lib/istox.rb

@@ -45,6 +45,11 @@ module Istox
   require 'istox/helpers/xray/rabbitmq_consumer_interceptor'
   require 'istox/helpers/xray/xray_initializer'
 
+  require 'istox/helpers/integration_test/grpc_client_interceptor'
+  require 'istox/helpers/integration_test/grpc_server_interceptor'
+  require 'istox/helpers/integration_test/rabbitmq_publisher_interceptor'
+  require 'istox/helpers/integration_test/rabbitmq_consumer_interceptor'
+
   require 'istox/models/blockchain_receipt'
   require 'istox/models/concerns/blockchain_receipt_query'
   require 'istox/consumers/blockchain_status_handler'

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -26,7 +26,12 @@ module Istox
                         txhash: transaction.txn_hashes.present? ? transaction.txn_hashes.join(',') : nil)
 
         resource = begin
-          class_eval("::#{receipt.resource_name}", __FILE__, __LINE__).find(receipt.resource_id)
+          cls = class_eval("::#{receipt.resource_name}", __FILE__, __LINE__)
+          if cls.respond_to?('with_deleted')
+            cls.with_deleted.find(receipt.resource_id)
+          else
+            cls.find(receipt.resource_id)
+          end
                    rescue NameError
                      log.warn "Transaction bind to #{receipt.resource_name} with id #{receipt.resource_id} class not found, skipping..."
                      return

data/lib/istox/helpers/blockchain_service.rb

@@ -8,8 +8,8 @@ module Istox
       @@blockchain_receipt_klass
     end
 
-    def self.request(sid:, action:, before:, execute:)
-      start(sid: sid, action: action, before: before, execute: execute, is_request: true)
+    def self.request(sid:, action:, before:, execute:, request_reason: nil)
+      start(sid: sid, action: action, before: before, execute: execute, is_request: true, request_reason: request_reason)
     end
 
     def self.run(sid:, action:, before:, execute:)
@@ -19,7 +19,7 @@ module Istox
       private
 
       # before is the proc that will be executed before, must return the main model blockchain receipt will bind to
-      def start(sid:, action:, before:, execute:, is_request: false)
+      def start(sid:, action:, before:, execute:, is_request: false, request_reason: nil)
         # create blockchain receipt first
         klass = blockchain_receipt_class
         uuid = ::SecureRandom.uuid
@@ -27,6 +27,7 @@ module Istox
           txid: uuid,
           sid: sid,
           is_request: is_request,
+          request_reason: request_reason,
           resource_action: action
         )
 

data/lib/istox/helpers/integration_test/grpc_client_interceptor.rb

@@ -0,0 +1,22 @@
+require 'istox/helpers/logger'
+
+module Istox
+  module IntegrationTest
+    class GrpcClientInterceptor < ::Gruf::Interceptors::ClientInterceptor
+      def call(request_context:)
+        request_context.metadata[:integration_test] = if ::Istox::IntegrationTest::Settings.enable
+                                                        '1'
+                                                      else
+                                                        '0'
+                                                      end
+
+        result = yield
+
+        result
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

data/lib/istox/helpers/integration_test/grpc_server_interceptor.rb

@@ -0,0 +1,31 @@
+require 'istox/helpers/logger'
+
+module Istox
+  module IntegrationTest
+    class GrpcServerInterceptor < ::Gruf::Interceptors::ServerInterceptor
+      def call
+        meta = request.active_call.metadata
+        enable_integration = (meta['integration_test'] if meta.present? && meta.key?('integration_test'))
+
+        if enable_integration == '1'
+          ::Istox::IntegrationTest::Settings.enable = true
+          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['integration']['database']
+            ActiveRecord::Base.establish_connection(:integration)
+          end
+        else
+          ::Istox::IntegrationTest::Settings.enable = false
+          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['development']['database']
+            ActiveRecord::Base.establish_connection(:development)
+          end
+        end
+
+        result = yield # this returns the protobuf message
+
+        result
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

data/lib/istox/helpers/integration_test/rabbitmq_consumer_interceptor.rb

@@ -0,0 +1,32 @@
+require 'istox/helpers/logger'
+
+module Istox
+  module IntegrationTest
+    class RabbitmqConsumerInterceptor
+      def call(payload, _metadata, _delivery_info)
+        payload_hash = payload.to_h
+
+        enable_integration_test = (payload_hash[:istox_integration_test] if payload_hash.key?(:istox_integration_test))
+
+        if enable_integration_test == '1'
+          ::Istox::IntegrationTest::Settings.enable = true
+          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['integration']['database']
+            ActiveRecord::Base.establish_connection(:integration)
+          end
+        else
+          ::Istox::IntegrationTest::Settings.enable = false
+          if ActiveRecord::Base.connection.current_database != Rails.configuration.database_configuration['development']['database']
+            ActiveRecord::Base.establish_connection(:development)
+          end
+        end
+
+        result = yield # this returns consumer handler message
+
+        result
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

data/lib/istox/helpers/integration_test/rabbitmq_publisher_interceptor.rb

@@ -0,0 +1,14 @@
+require 'istox/helpers/logger'
+
+module Istox
+  module IntegrationTest
+    class RabbitmqPublisherInterceptor
+      def call(message, _options)
+        message[:istox_integration_test] = '1'
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

data/lib/istox/helpers/integration_test/settings.rb

@@ -0,0 +1,11 @@
+require 'istox/helpers/logger'
+
+module Istox
+  module IntegrationTest
+    class Settings
+      class << self
+        attr_accessor :enable
+      end
+    end
+  end
+end

data/lib/istox/helpers/messaging.rb

@@ -130,7 +130,25 @@ module Istox
             next unless ce.present?
 
             copy_email_data = email_data.clone
-            copy_email_data[:email] = ce
+
+            # if it is just email to cc
+            if ce.is_a? String
+              copy_email_data[:email] = ce
+            else
+              # if it is a object hash
+              # {
+              #     email: xxxx
+              #     params: {
+              #       istoxP1: xxxx,
+              #       istoxP2: xxxx
+              #     }
+              # }
+              next unless ce[:email].present?
+
+              copy_email_data[:email] = ce[:email]
+              copy_email_data = copy_email_data.merge(ce[:params])
+            end
+
             copy_email_data.delete(:copy_emails)
             copy_email_data_arr << copy_email_data
           end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.157.8'.freeze
+  VERSION = '0.1.158.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.157.8
+  version: 0.1.158.1
 platform: ruby
 authors:
 - Siong Leng
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -511,6 +511,11 @@ files:
 - lib/istox/helpers/graphql_client.rb
 - lib/istox/helpers/grpc_client.rb
 - lib/istox/helpers/gruf_listener_hook.rb
+- lib/istox/helpers/integration_test/grpc_client_interceptor.rb
+- lib/istox/helpers/integration_test/grpc_server_interceptor.rb
+- lib/istox/helpers/integration_test/rabbitmq_consumer_interceptor.rb
+- lib/istox/helpers/integration_test/rabbitmq_publisher_interceptor.rb
+- lib/istox/helpers/integration_test/settings.rb
 - lib/istox/helpers/logger.rb
 - lib/istox/helpers/messaging.rb
 - lib/istox/helpers/my_open_struct.rb
@@ -539,7 +544,7 @@ files:
 homepage: http://www.abc.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -554,9 +559,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: istox backend shared gem
 test_files: []