istox 0.1.67 → 0.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521821a9c200ed635e2566632ca07539e3abdd01bec5320fb0b0eb7f4865bce2
-  data.tar.gz: ea237b283651ef6885b13cae392cbd5fe27ee7e1a8357df73c9aadea06a55a45
+  metadata.gz: 45ce1d566ed6248aa5ce93677cc65c10c6daebfd0f4b168514cc38e268d53130
+  data.tar.gz: fa148b1ecb82531f8773171436efcf427176b64509b2202cc37201d5e33d158a
 SHA512:
-  metadata.gz: d37092798a3a63de395a3a7214acee390a168e4699f824e6a76afb2b81c1a91d2a5131df13b40465f5345881d9c2e5c476f03750fc7fe5e7aed3123f7e2473f1
-  data.tar.gz: 0266f50e0d96cc0df8a52329b81c701ca9d5ac8bfe13b83c467415029d703b45b3d71fa2c8c7172c5cc6014164f9cff64d26048b7ca965cae52dc66fbb5eaedf
+  metadata.gz: 3825904cd3232d5db9e3e9760d0d29016be5381a0e2d3b319646eded1c0cb6f065b97b32c7e126c5fa6de422e7e81a91177eb10993405806c2b549d54a491bf3
+  data.tar.gz: 3964cc194458dcbad28f0abea7faeaff7f281e23de55078adb5ba49fe7f996007012245918d18c5398f8f2c962dbd64531df8aa8cf34985dcc27cc7860a642f0

data/lib/istox/consumers/blockchain_hash_handler.rb

@@ -11,6 +11,8 @@ module Istox
   
           # sid cannot be nil
           update_receipt = ::Istox::BlockchainReceipt.where(txid: data.uuid, txhash: nil).where.not(sid: nil).first
+          raise "Unable to find receipt to update" if update_receipt.blank?
+
           update_receipt.update!(txhash: data.txnHash)
         end
       end

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -1,6 +1,46 @@
 module Istox
   class BlockchainStatusHandler
     class << self
+
+      def txn_data_confirmed(transactions)
+        found_txns = transactions.map do |transaction|
+          receipt = ::Istox::BlockchainReceipt.where(txid: transaction.uuid).first
+          if !receipt.blank?
+            handling_receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
+            raise 'Unable to find receipt' if handling_receipt.blank?
+            transaction
+          else
+            puts 'Transaction doesnt belong here, skipping...'
+            nil
+          end
+        end.compact
+
+        found_txns.each do |transaction|
+          receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
+
+          resource = begin
+            class_eval("::#{receipt.resource_name}").find(receipt.resource_id)
+          rescue => e
+            puts "Class not found, skipping..."
+            next
+          end
+
+          receipt_list = get_receipt_list(resource)
+
+          next if resource_handled?(receipt_list)
+
+          next if resource.outcome == 'pending'
+
+          if resource.outcome == 'confirmed'
+            resource.handle_confirm(receipt.resource_action)
+            
+            mark_resource_handled(receipt_list)
+            publish_to_frontend(resource, true, receipt, receipt.sid, receipt_list)
+          end
+
+        end
+      end
+
       def txn_status_changed(transactions, payload_target)
         # pre check all transaction does exists
         found_txns = transactions.map do |transaction|
@@ -18,7 +58,7 @@ module Istox
         found_txns.each do |transaction|
           receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
 
-          next if !(%w[failed confirmed pending].include?(transaction.status))
+          next if !(%w[failed pending].include?(transaction.status))
           receipt.update!(status: transaction.status)
           
           resource = begin
@@ -32,16 +72,16 @@ module Istox
 
           next if resource_handled?(receipt_list)
 
-          if transaction.status == 'confirmed'
-            next if resource.outcome == 'pending'
+          # if transaction.status == 'confirmed'
+          #   next if resource.outcome == 'pending'
 
-            if resource.outcome == 'confirmed'
-              resource.handle_confirm(receipt.resource_action)
+          #   if resource.outcome == 'confirmed'
+          #     resource.handle_confirm(receipt.resource_action)
               
-              mark_resource_handled(receipt_list)
-              publish_to_frontend(resource, true, receipt, receipt.sid, receipt_list)
-            end
-          end
+          #     mark_resource_handled(receipt_list)
+          #     publish_to_frontend(resource, true, receipt, receipt.sid, receipt_list)
+          #   end
+          # end
 
           if transaction.status == 'failed'
             resource.handle_fail(receipt.resource_action)

data/lib/istox/logging/log_formatter.rb

@@ -4,8 +4,20 @@ module Istox
     class LogFormatter
       def call(severity, time, progname, msg='')
         return '' if msg.blank?
-        return "timestamp='#{time}' level=#{severity} progname='#{progname}' #{processed_message(msg)}\n" if progname.present?
-        "timestamp='#{time}' level=#{severity} #{processed_message(msg)}\n"
+
+        hash = {
+          level: severity,
+          message: processed_message(msg)
+        }
+
+        if progname.present?
+          hash[:app] = progname
+        end
+
+        return JSON.pretty_generate(hash) + "\n"
+
+        # return "timestamp='#{time}' level=#{severity} progname='#{progname}' #{processed_message(msg)}\n" if progname.present?
+        # "timestamp='#{time}' level=#{severity} #{processed_message(msg)}\n"
       end
 
       private
@@ -13,7 +25,7 @@ module Istox
       def processed_message(msg)
         return msg.map { |k, v| "#{k}='#{v.strip}'" }.join(' ') if msg.is_a?(Hash)
 
-        "message='#{msg.strip}'"
+        msg
       end
     end
   end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.67"
+  VERSION = "0.1.68"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.67
+  version: 0.1.68
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem