istox 0.2.4.1 → 0.2.5.3.pre.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7966045ae225d89f6881853faebfc2b9ac826053964d27f1d79a1870be301da
-  data.tar.gz: ddaf8c7cfcbf15d62d7d5ec739593c2b1f5b93e80d502c852a14c852941b03a0
+  metadata.gz: 8d40b03190a4031801135b746396d633f859011765e6dbda5f033121eb6b18ba
+  data.tar.gz: 27d7a3334d086abc719e50e772f9db988a5f2a725d88c6de887294fe6acc7140
 SHA512:
-  metadata.gz: 2c207054f717f60a2eadc3dab9cd39954e58e2c37748ab18df87ec687516e9b68f2abf44176405028fee8872e61e8a808271e41bbda63d63ca54a1959ff56c37
-  data.tar.gz: eb784318e41850201bd1bfbac812d7d153959141385cb9e01fe7071948e648e46b6fd240e912bd62670b7de9ea6f1eca6a5be75e7731a6ba2cdfede8e7a8b13b
+  metadata.gz: 8c2e04d496e6316556d8812504cbaab020a4d1e0111d9c9419bd2ee9c2d70fa615ceaaf00ad40b034506e3b2e19f5ce73998dfbfdaae9bb1aed81c03bd7db52f
+  data.tar.gz: 6bbf9414ea1eb3319e74ecf49a5600e800ef807a74f149967d7b253aeae6fa64e57d77d25de7aa94cb735dcdca439141df427e20cfb45ba6ac18a3f238e267ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.157.9)
+    istox (0.2.3.pre.1)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -64,10 +64,10 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amazing_print (1.2.1)
+    amazing_print (1.3.0)
     amq-protocol (2.3.2)
     arel (9.0.0)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
     aws-eventstream (1.1.0)
     aws-partitions (1.318.0)
     aws-sdk-core (3.96.1)
@@ -86,7 +86,7 @@ GEM
     aws-xray-sdk (0.11.4)
       aws-sdk-xray (~> 1.4.0)
       multi_json (~> 1)
-    binding_of_caller (0.8.0)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     bullet (5.7.6)
@@ -99,8 +99,9 @@ GEM
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     database_cleaner (1.6.2)
-    debug_inspector (0.0.3)
+    debug_inspector (1.1.0)
     diff-lcs (1.3)
+    e2mmap (0.1.0)
     erubi (1.9.0)
     exponential-backoff (0.0.4)
     factory_bot (4.8.2)
@@ -112,34 +113,40 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.0.1)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.13.1)
+    ffi (1.15.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.13.0-universal-darwin)
-    googleapis-common-protos-types (1.0.5)
-      google-protobuf (~> 3.11)
-    graphlient (0.4.0)
+    google-protobuf (3.15.6-universal-darwin)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
+    graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.4)
+    graphql (1.12.6)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.32.0-universal-darwin)
-      google-protobuf (~> 3.13)
+    grpc (1.36.0-universal-darwin)
+      google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.32.0)
-    gruf (2.8.1)
+    grpc-tools (1.36.0)
+    gruf (2.9.1)
       activesupport (> 4)
       concurrent-ruby (> 1)
+      e2mmap (~> 0.1)
       grpc (~> 1.10)
       grpc-tools (~> 1.10)
+      json (>= 2.3)
       slop (~> 4.6)
+      thwait (~> 0.1)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -150,6 +157,7 @@ GEM
       grpc-tools (~> 1.10)
       slop (~> 4.6)
     jmespath (1.4.0)
+    json (2.5.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -170,11 +178,11 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.14)
-    ougai (1.8.5)
+    oj (3.11.3)
+    ougai (2.0.0)
       oj (~> 3.10)
-    paranoia (2.4.2)
-      activerecord (>= 4.0, < 6.1)
+    paranoia (2.4.3)
+      activerecord (>= 4.0, < 6.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -222,7 +230,7 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.8.0)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
     redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
@@ -254,6 +262,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    ruby2_keywords (0.0.4)
     slop (4.8.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -265,11 +274,13 @@ GEM
     sqlite3 (1.3.13)
     thor (0.20.3)
     thread_safe (0.3.6)
+    thwait (0.2.0)
+      e2mmap
     timecop (0.9.1)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.15.0)
+    vault (0.16.0)
       aws-sigv4
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)

data/lib/istox/helpers/messaging.rb

@@ -23,7 +23,7 @@ module Istox
             type: 'SEND_SMS',
             data: {
               to: targets,
-              subject: subject || 'Message from iSTOX',
+              subject: subject || 'Message from ADDX',
               body: content
             }
           }
@@ -93,6 +93,7 @@ module Istox
       # sample template data, it should be an array
       # [{
       #    email: email,
+      #    sid: xxxxx,
       #    istoxP1: auth.first_name,
       #    <more other sample template attributes>: <other sample template data>,
       # }]
@@ -129,7 +130,8 @@ module Istox
           email_data[:copy_emails].each do |ce|
             next unless ce.present?
 
-            copy_email_data = email_data.clone
+            # uid and sid are reserved fields that should be not cloned
+            copy_email_data = email_data.clone.except(:sid).except(:uid)
 
             # if it is just email to cc
             if ce.is_a? String
@@ -137,7 +139,8 @@ module Istox
             else
               # if it is a object hash
               # {
-              #     email: xxxx
+              #     email: xxxx,
+              #     sid: xxxx,
               #     params: {
               #       istoxP1: xxxx,
               #       istoxP2: xxxx
@@ -146,7 +149,8 @@ module Istox
               next unless ce[:email].present?
 
               copy_email_data[:email] = ce[:email]
-              copy_email_data = copy_email_data.merge(ce[:params])
+              copy_email_data[:sid] = ce[:sid]
+              copy_email_data = copy_email_data.merge(ce[:params]) if ce[:params].present?
             end
 
             copy_email_data.delete(:copy_emails)
@@ -157,6 +161,25 @@ module Istox
         end
         template_data_arr.concat(copy_email_data_arr)
       end
+
+      def push_notification(template_name, template_data_arr)
+        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil?
+
+        return log.info 'Template data is empty, skipping this request' if template_data_arr.empty?
+
+        ::Istox::Publisher.manual_publish(
+          exchange: 'message',
+          exchange_type: 'direct',
+          routing_key: 'push_notification.message',
+          message: {
+            type: 'SEND_PUSH_NOTIFICATION',
+            data: {
+              template_name: template_name,
+              template_data_arr_json: template_data_arr.to_json
+            }
+          }
+        )
+      end
     end
   end
 end

data/lib/istox/helpers/sns_publisher.rb

@@ -14,12 +14,16 @@ module Istox
 
         message = JSON.generate(message) unless message.is_a? String
 
-        sns_client.publish(topic_arn: topic_arn || ENV.fetch('SNS_CLIENT_TOPIC', ''), message: message)
+        topic = topic_arn || ENV.fetch('SNS_CLIENT_TOPIC', '')
+
+        log.info("Publishing SNS to topic: #{topic} with message: #{message}")
+
+        sns_client.publish(topic_arn: topic, message: message)
 
         log.info('Publish to SNS successfully.')
       rescue StandardError => e
-        log.fatal 'Unable to publish SNS message.'
-        log.fatal(e)
+        log.info 'Unable to publish SNS message.'
+        log.info(e)
         log.info('Failed to publish SNS, ignoring...') unless throw_exception
 
         raise e if throw_exception

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.2.4.1'.freeze
+  VERSION = '0.2.5.3-52'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.2.4.1
+  version: 0.2.5.3.pre.52
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -542,11 +542,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.11
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem