istox 0.1.158.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f303881190d40e32795203028cfc7e21c68a5e34f4240c63f09cacbc116ee5
-  data.tar.gz: '01196f2df3a75a91f969d04585b0683176d3624e5bb14894be61074025f33fbe'
+  metadata.gz: 32b60e5cea8c89edc2c9d9a9b4a9aaefeb026351d68ed6898b578f04213f7e81
+  data.tar.gz: e969dc0c25653d64d0de4173bd59178e3f2da8b080fe7db9d34f7c56b67bb791
 SHA512:
-  metadata.gz: 349210e9975fde52b911856fae0602bd92d55a2350a809bc6e6f8bf59f2fa9d47b43b5a9f88ddc2c0e57b4cea7eb5bc4be90b9a817155cd606b72b37e4bdbf5d
-  data.tar.gz: b4c3249825bf6eb114ce7d8d40ed3265b422b258722c449991b2eecc2b30e1b6ac98de6035730294f0c328465f4c640dafa7e6b7426a7e2652a256246927f11e
+  metadata.gz: 88109a86cc415878a19a461ed56252c42562fd44a40861eebe04f5a65a57c4b59df823851a047e59db49f78a5873e63eb99a27cf91f2e4a1c56646660b5f3e67
+  data.tar.gz: 9106e4ba0fd8bc5a965fcee3d3e78f1c6cf89ab5f2dcb1c3cbd7762913d6c6382b73c0173985c5f358aca6c58e697bfb78574c7c2c1b88af1b8a2702e89b5aea

data/lib/istox.rb

@@ -45,12 +45,6 @@ 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/helpers/integration_test/settings'
-
   require 'istox/models/blockchain_receipt'
   require 'istox/models/concerns/blockchain_receipt_query'
   require 'istox/consumers/blockchain_status_handler'

data/lib/istox/helpers/common_helper.rb

@@ -58,5 +58,11 @@ module Istox
         obj
       end
     end
+
+    def self.get_currency_decimal(currency)
+      return 0 if currency&.downcase == 'jpy'
+
+      2
+    end
   end
 end

data/lib/istox/helpers/formatter.rb

@@ -17,8 +17,18 @@ module Istox
       end
 
       # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind, abs_num: whether to absolute the number
-      def money(input, round_mode: :half_up, precision: 2, currency:, position: :front, abs_num: false)
-        result = number(input, round_mode: round_mode, precision: precision, abs_num: abs_num)
+      def money(input, round_mode: :half_up, precision: nil, currency:, position: :front, abs_num: false, hide_currency: false)
+        # precision = ::Istox::CommonHelper.get_currency_decimal(currency, precision)
+
+        decimal_place = if precision.present?
+                          precision
+                        else
+                          ::Istox::CommonHelper.get_currency_decimal(currency)
+                        end
+
+        result = number(input, round_mode: round_mode, precision: decimal_place, abs_num: abs_num)
+
+        return result if hide_currency
 
         return currency + ' ' + result if position == :front
 

data/lib/istox/helpers/sns_publisher.rb

@@ -14,7 +14,7 @@ module Istox
 
         message = JSON.generate(message) unless message.is_a? String
 
-        sns_client.publish({ topic_arn: topic_arn || ENV.fetch('PUSHER_TOPIC_ARN', ''), message: message })
+        sns_client.publish(topic_arn: topic_arn || ENV.fetch('SNS_CLIENT_TOPIC', ''), message: message)
 
         log.info('Publish to SNS successfully.')
       rescue StandardError => e
@@ -28,8 +28,15 @@ module Istox
       def sns_client
         return @sns_client if @sns_client.present?
 
-        Aws.config.update({ region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
-                            credentials: Aws::Credentials.new(ENV.fetch('AWS_STS_ACCESS_KEY_ID'), ENV.fetch('AWS_STS_SECRET_ACCESS_KEY')) })
+        access_key = ENV.fetch('AWS_STS_ACCESS_KEY_ID', nil)
+
+        if access_key.present?
+          credentials = Aws::Credentials.new(ENV.fetch('AWS_STS_ACCESS_KEY_ID', nil), ENV.fetch('AWS_STS_SECRET_ACCESS_KEY', nil))
+          Aws.config.update(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
+                            credentials: credentials)
+        else
+          Aws.config.update(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'))
+        end
 
         @sns_client = Aws::SNS::Client.new(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'))
       end

data/lib/istox/helpers/xray/grpc_client_xray_interceptor.rb

@@ -22,6 +22,7 @@ module Istox
 
         request_context.metadata[:xray_trace_id] = XRay.recorder.current_segment.trace_id
         request_context.metadata[:xray_parent_id] = XRay.recorder.current_segment.id
+        Thread.current[:tracer_id] = XRay.recorder.current_segment.trace_id
 
         result = yield
 

data/lib/istox/helpers/xray/grpc_server_xray_interceptor.rb

@@ -7,6 +7,7 @@ module Istox
         meta = request.active_call.metadata
         trace_id = (meta['xray_trace_id'] if meta.present? && meta.key?('xray_trace_id'))
         parent_id = (meta['xray_parent_id'] if meta.present? && meta.key?('xray_parent_id'))
+        Thread.current[:tracer_id] = trace_id
 
         XRay.recorder.begin_segment("#{::Istox::Xray::XrayInitializer.service_name}.grpc.#{request.method_key}",
                                     trace_id: trace_id, parent_id: parent_id)

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

@@ -8,6 +8,7 @@ module Istox
 
         trace_id = (payload_hash[:xray_trace_id] if payload_hash.key?(:xray_trace_id))
         parent_id = (payload_hash[:xray_parent_id] if payload_hash.key?(:xray_parent_id))
+        Thread.current[:tracer_id] = trace_id
 
         arr = [delivery_info[:exchange]&.downcase, delivery_info[:routing_key]&.downcase, payload_hash[:type]&.downcase].compact
 

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

@@ -22,6 +22,7 @@ module Istox
 
         message[:xray_trace_id] = XRay.recorder.current_segment.trace_id
         message[:xray_parent_id] = XRay.recorder.current_segment.id
+        Thread.current[:tracer_id] = XRay.recorder.current_segment.trace_id
 
         XRay.recorder.end_subsegment
 

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.158.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.158.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -480,14 +480,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".idea/.rakeTasks"
-- ".idea/encodings.xml"
-- ".idea/inspectionProfiles/Project_Default.xml"
-- ".idea/istox-gem.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vcs.xml"
-- ".idea/workspace.xml"
 - ".rubocop.yml"
 - ".solargraph.yml"
 - CODE_OF_CONDUCT.md
@@ -511,11 +503,6 @@ 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

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

data/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

data/.idea/istox-gem.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.6, RVM: ruby-2.5.3 [global]) [gem]" level="application" />
-  </component>
-</module>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.5.3 [global]" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/istox-gem.iml" filepath="$PROJECT_DIR$/.idea/istox-gem.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

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

@@ -1,22 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

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