imperituroard 1.1.18 → 1.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c33a43a67fc96768e51fb1a612372b67bb6d27d
-  data.tar.gz: 2c15329e9f493ef186d9ae0955e4d2c552bf7ebd
+  metadata.gz: df0315f95d36982cd1cf6ad9ac5925220a3e59b3
+  data.tar.gz: 62923d40fde4cfa7ec258081b889d092caf97993
 SHA512:
-  metadata.gz: 963dc4dbffee66e2822d4a58bc2603dd4183480066beb9e7828b7426f502b28894decaf56a759d1addf0e6a1bcb0fd1960a341c35cec857772d9158807b6d0f0
-  data.tar.gz: 3d099c234e11fd1b2d3cc995b767225da3a27c9edaf9f6a08ff9b768099927dfc117da499c14c017de2127cfabcffe7cb4da009c13cd4fe22cd9f066b941c279
+  metadata.gz: 961910f9feb82ef16f3bd8e14336cf60f763f367235f0671fc7d45650e53ce888e947b95cd7b2c5e3cc7d183da60a084dab10d7638d17746dcbafe19b782efdc
+  data.tar.gz: da42b0f9d31a6bf7378c0ee37051571fb21d8f9cc9c7f80a3a2f72468fb78f93a04b32019489830f09f0c81e7f2f3a7ca9c2f5bb73df9d37282e1a5c83fd7669

data/lib/imperituroard.rb

@@ -272,7 +272,7 @@ class Iot
 
   #15 integration with SPA
   # add imei to correct profile
-  def spa_service_set(soapgw_params, real_ip, remote_ip)
+  def sdk_spa_service_set(soapgw_params, real_ip, remote_ip)
     #imei
     #imsi
     #msisdn

data/lib/imperituroard/projects/iot.rb

@@ -1388,8 +1388,26 @@ class IotFunctions_2
 
   def spa_service_set_2(soapgw_params, real_ip, remote_ip)
     input_params = {:soapgw_params => soapgw_params, :real_ip => real_ip, :remote_ip => remote_ip}
-    output_answ = {:code => 200, :message => 'Request completed successfully', :body => {:to_soap_gw => {}}}
-    mongo_client.audit_spa_logger('spa_service_set_2', remote_ip, input_params, output_answ, real_ip, {})
+    output_answ = {}
+    begin
+      output_answ = {:code => 200,
+                     :message => 'Request completed successfully',
+                     :body => {
+                         :to_soap_gw => {
+                             :code => 200,
+                             :result => 'Request completed successfully'
+                         }}}
+      mongo_client.audit_spa_logger('spa_service_set_2', {:remote_ip => remote_ip, :real_ip => real_ip}, input_params, output_answ)
+    rescue
+      output_answ = {:code => 500,
+                     :message => 'Server error',
+                     :body => {
+                         :to_soap_gw => {
+                             :code => 500,
+                             :result => 'Server error'
+                         }}}
+    end
+    output_answ
   end
 
 

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/projects/mhub/subs/dabrab/dabrab_proced.rb

@@ -171,7 +171,7 @@ class Dabrab
 
     for a in hub_answer[:body][:res_body]["messages"]
       status1 = {}
-      if a["processed"] == true && a["accepted"] == true
+      if a['accepted']
         status1 = {"to": {"phoneNumber": a["phone_number"]},
                    "status": {"groupId": 1,
                               "groupName": "PENDING",
@@ -232,6 +232,20 @@ class Dabrab
         } #Viber subscriber not exists
     }
 
+    data_for_status.default = {:status_id => 9,
+                               :status_grid => 2,
+                               :status_grname => 'UNDELIVERABLE_NOT_DELIVERED',
+                               :status_name => 'UNDELIVERED',
+                               :status_descr => 'Unknown error default',
+                               :error_id => 32,
+                               :error_grid => 1,
+                               :error_grname => 'HANDSET_ERRORS',
+                               :error_name => 'EC_SM_DELIVERY_FAILURE',
+                               :error_descr => 'Unknown error default',
+                               :error_permanent => false
+    }
+
+
     if hub_report_in.key?("msg_status") && !hub_report_in.key?("_json") && !hub_report_in["report"].key?("_json")
       internal_func.printer_texter({:input => "One message delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
 
@@ -301,7 +315,7 @@ class Dabrab
         internal_func.printer_texter({:input => {:hub_report2 => hub_report2}, :procedure => "Dabrab.delivery_report_transform"}, log_level)
 
 
-        if data_for_status[hub_report2["msg_status"]] != nil && data_for_status[hub_report2["msg_status"]] != {} && data_for_status[hub_report2["msg_status"]] != [] && data_for_status[hub_report2["msg_status"]] != ""
+        if data_for_status[hub_report2["msg_status"]] != nil && data_for_status[hub_report2["msg_status"]] != {} && data_for_status[hub_report2["msg_status"]] != [] && data_for_status[hub_report2["msg_status"]] != ''
           report_to_recip.push({
 
                                    "bulkId": "00000000-0000-0000-0000-000000000000",

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = '1.1.18'
+  VERSION = '1.1.23'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.23
 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