imperituroard 1.1.20 → 1.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7f0fc8144845989685567ed37d05cb510b8710
-  data.tar.gz: 26bde7ae4b31e772a6684df490a67e8c9aeb1ed2
+  metadata.gz: e042da52091fac7c1d66d52634e37ba786a8b78c
+  data.tar.gz: 0411bae82c9e4649df353c9c68a73841dfaf2abc
 SHA512:
-  metadata.gz: 474535bbe80460b3a8a82ae5dde557ead88620b366e57e3a05136bf0e8ef8f27890731a1b17869b82abd2fbec553d6806f6c1686defaa9340a88b4bd10474bf4
-  data.tar.gz: c6fa751ba7c5e19ab8c4af411460add46f1eedc19e3bfaec72b9606abc0bfd3d6ae1413830c0c29dbba978b6b7d2d7f2615337294238a2bc06b63f27b74269f5
+  metadata.gz: 306ceecd1adfb971b2af29d671f72bd2fe8abcfdb87ea06098c482fac722a0f44a65259aa0c3875d5d3016a17826986fd870c2f6f6479453567970352a95d666
+  data.tar.gz: 6e27c6affb06bc0a1932691b82823be16c544c783b687fe46c1a3d6abea28088189090cd0b4ca4d5d79bdd3e4102b29cd3d6906a6f02f68d2805e78990095f41

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -34,9 +34,9 @@ class HuaIot
   def parse_token(str)
     begin
       dd = str.split(",")
-      acc_token = ""
-      refr_token = ""
-      exp_in = ""
+      acc_token = ''
+      refr_token = ''
+      exp_in = ''
 
       access_token = /"accessToken":"(\S+)"/
       refresh_token = /"refreshToken":"(.+)"/

data/lib/imperituroard/projects/mhub.rb

@@ -210,23 +210,44 @@ class MhubFunctions_2
 
   #for bank dabrabyt
   def rec_deliv_report_2(params, ip_src, ip_real, ip_vip, crm_slice_num=2)
+    internal_func.printer_texter({:mess => 'started function rec_deliv_report_2'}, log_level)
     input_params = {:params => params, :ip_src => ip_src, :ip_real => ip_real, :ip_vip => ip_vip}
     output_params = {}
     hub_resp = {}
+    result = {}
 
+    internal_func.printer_texter({:mess => 'rec_deliv_report_2 step1'}, log_level)
     begin
       mes_report = dabrab_connecter.delivery_report_transform(params)[:body][:report_to_recip]
-      result = crm_connector.crm_status_2(mes_report, crm_slice_num)
-      if result[:body][:res_body]["GetReportsResult"]==""
-        output_params = {"code": 200, "result": "Data processed", "body": {"answer": {"code": 200, "status": "Success"}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      internal_func.printer_texter({:mess => 'rec_deliv_report_2 step2'}, log_level)
+
+      begin
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step2.1'}, log_level)
+        result = crm_connector.crm_status_2(mes_report, crm_slice_num)
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step2.2'}, log_level)
+      rescue
+        result = {:code => 505505, :result => 'Error', :body => {:res_body => 'Error communication with crm'}}
+      end
+
+      internal_func.printer_texter({:mess => 'rec_deliv_report_2 step3'}, log_level)
+      if result[:body][:res_body] == ''
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step4'}, log_level)
+        output_params = {'code': 200, 'result': 'Data processed', 'body': {'answer': {'code': 200, 'status': 'Success'}, 'sender': {'ip_src': ip_src, 'ip_real': ip_real, 'ip_vip': ip_vip}}}
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step5'}, log_level)
+      elsif result[:code] == 505505
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step5.1'}, log_level)
+        output_params = {'code': 505, 'result': 'Data processed', 'body': {'answer': {'code': 505, 'status': 'Error communicate with dabrabyt'}, 'sender': {'ip_src': ip_src, 'ip_real': ip_real, 'ip_vip': ip_vip}}}
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step5.2'}, log_level)
       else
-        output_params = {"code": 202, "result": "CRM returned error #{result[:body][:res_body]["GetReportsResult"].to_s}", "body": {"answer": {"code": 200, "status": "Success"}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step6'}, log_level)
+        output_params = {'code': 202, 'result': "CRM returned error #{result[:body][:res_body]['GetReportsResult'].to_s}", 'body': {'answer': {'code': 200, 'status': 'Success'}, 'sender': {'ip_src': ip_src, 'ip_real': ip_real, 'ip_vip': ip_vip}}}
+        internal_func.printer_texter({:mess => 'rec_deliv_report_2 step7'}, log_level)
       end
     rescue
-      output_params = {"code": 500, "result": "MhubFunctions_2.rec_deliv_report_2: Unknown SDK error", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      output_params = {'code': 500, 'result': 'MhubFunctions_2.rec_deliv_report_2: Unknown SDK error', 'body': {'answer': {}, 'sender': {'ip_src': ip_src, 'ip_real': ip_real, 'ip_vip': ip_vip}}}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :hub_resp => hub_resp, :procedure => "Mhub_2.recieve_delivery_report"}, log_level)
+    internal_func.printer_texter({:input => input_params, :output => output_params, :hub_resp => hub_resp, :procedure => 'Mhub_2.recieve_delivery_report'}, log_level)
     output_params
   end
 

data/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_platform.rb

@@ -22,11 +22,13 @@ class Crm_2
 
     begin
 
-      internal_func.printer_texter({:input => "Start process", :procedure => "Crm_2.crm_status_2"}, log_level)
+      internal_func.printer_texter({:input => 'Start process', :procedure => "Crm_2.crm_status_2"}, log_level)
 
 
       thr_crm_status_2 = Thread.new do
 
+        internal_func.printer_texter({:input => 'Thread start', :procedure => 'Crm_2.crm_status_2'}, log_level)
+
         partnnn = crm_payload[:results].each_slice(slice_num).to_a
 
         partnnn.each { |one_part_reports|
@@ -37,6 +39,8 @@ class Crm_2
           uri = URI(crm_callback_url)
           #8 - client id
 
+          internal_func.printer_texter({:input => 'before net', :procedure => 'Crm_2.crm_status_2'}, log_level)
+
           https = Net::HTTP.new(uri.host, uri.port)
           https.use_ssl = true
           https.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -54,10 +58,19 @@ class Crm_2
 
           internal_func.printer_texter({:input => "Before send request to crm", :procedure => "Crm_2.crm_status_2"}, log_level)
 
-          res = https.request(req)
+          begin
+
+            res = https.request(req)
+            internal_func.printer_texter({:input => "After send request to crm Ok", :procedure => "Crm_2.crm_status_2"}, log_level)
+            internal_func.printer_texter({:input => {:res_code => res.code, :res_body => res.body.to_s}, :procedure => "Crm_2.crm_status_2"}, log_level)
+
+          rescue
+
+            res = 'dabrabyt error'
+            internal_func.printer_texter({:input => "After send request to crm error", :procedure => "Crm_2.crm_status_2"}, log_level)
+            internal_func.printer_texter({:input => {:res_code => "500", :res_body => res}, :procedure => "Crm_2.crm_status_2"}, log_level)
 
-          internal_func.printer_texter({:input => "After send request to crm", :procedure => "Crm_2.crm_status_2"}, log_level)
-          internal_func.printer_texter({:input => {:res_code => res.code, :res_body => res.body.to_s}, :procedure => "Crm_2.crm_status_2"}, log_level)
+          end
 
         }
 

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = '1.1.20'
+  VERSION = '1.1.21'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.1.21
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler