imperituroard 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629626efbfcfa0108c2b1646a42d25856e6f3135
-  data.tar.gz: 8a3a7f5357873aa432d9058a2a54d933e6177c7d
+  metadata.gz: 06a24d95016bbc1c495cb86ef3f2cbebd39bfa21
+  data.tar.gz: 647278e86d5ec1f44cf808e8c3a63f7f1c4c7b64
 SHA512:
-  metadata.gz: 61e4e034d6b705161bc67e7c270406cbb62a0306ca18c17a619b04b6cf78af4bd802c0f59517e5856101ec75be031be38086872e68893de159412ef241aaaf53
-  data.tar.gz: 87151a1bbfa092b6d77fef7279cf114446dba7540ca949b897cad0a8f77270afe3833d7d49678f7e46476fb144be849a805d2bc493c2c625b3a185630f1e96ad
+  metadata.gz: 74ae2cf7887f78b327956031bf5babab5ab78477b094b1f866ec6b43fd00796cf1a766cf21980507152434aafd9918917b3877f7adb62d15c7edee812c4deafa
+  data.tar.gz: 144a7e259528a7fa57a6f4f81a558e0604d1957cf294cf7479d8bfa35b896849bc216180180c6e418bc8672d031674d97d6f9c1ff729b2adbc1f37a98be66624

data/lib/imperituroard.rb

@@ -311,19 +311,21 @@ class Mhub_2
                 :internal_func,
                 :dabrab_connecter,
                 :static_callback,
-                :crm_connector
+                :crm_connector,
+                :log_level
 
-  def initialize(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname)
+  def initialize(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname, log_level)
     @sk_url = sk_url_simple
     @sk_login = sk_login
     @sk_password = sk_password
+    @log_level = log_level
     @internal_func = InternalFunc.new
-    @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
+    @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id, log_level)
     @internal_func = InternalFunc.new
     @dabrab_connecter = Dabrab.new
     @static_callback = static_callback
-    @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
-    @mhub_connector = MhubFunctions_2.new(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname)
+    @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id, log_level)
+    @mhub_connector = MhubFunctions_2.new(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname, log_level)
   end
 
   #{"destinations"=>[{"to"=>{"phoneNumber"=>"375297116638", "emailAddress"=>nil}}],
@@ -339,6 +341,10 @@ class Mhub_2
     mhub_connector.get_send_message_2(params, ip_src, ip_real, ip_vip)
   end
 
+  def get_send_message_mass(params, ip_src, ip_real, ip_vip)
+    mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip)
+  end
+
   def recieve_delivery_report(params, ip_src, ip_real, ip_vip)
     mhub_connector.rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
   end

data/lib/imperituroard/add_functions/logger/any_functions.rb

@@ -14,8 +14,10 @@ class LogAddFunctions_2
   end
 
   def printer_texter(text, log_level)
-    mess = {:datetime => datetimenow, :sdk => "imperituroard", :sdk_version => Imperituroard::VERSION, :message => text}
-    p mess
+    if log_level == debug
+      mess = {:datetime => datetimenow, :sdk => "imperituroard", :sdk_version => Imperituroard::VERSION, :message => text}
+      p mess
+    end
   end
 
 

data/lib/imperituroard/platforms/iwag/get_iwag_data.rb

@@ -0,0 +1,90 @@
+require 'net/ssh'
+
+class IwagRequester
+
+  attr_accessor :iwag_host, :iwag_login, :iwag_password
+
+  def initialize(iwag_host, iwag_login, iwag_password)
+    @iwag_host = iwag_host
+    @iwag_login = iwag_login
+    @iwag_password = iwag_password
+  end
+
+  def mac_parse(mac)
+    a = mac.upcase
+    pos = a[0] + a[1]
+    if pos == "01"
+      subscribers_mac = a[2] + a[3] + ":" + a[5] + a[6] + ":" + a[7] + a[8] + ":" + a[10] + a[11] + ":" + a[12] + a[13] + ":" + a[15] + a[16]
+    else
+      subscribers_mac = a[0] + a[1] + ":" + a[2] + a[3] + ":" + a[5] + a[6] + ":" + a[7] + a[8] + ":" + a[10] + a[11] + ":" + a[12] + a[13]
+    end
+    subscribers_mac
+  end
+
+
+  def iwag_get_dhcp_binding_ssh(bind_ip)
+    mac = "Unknown"
+    accessinterface = "Unknown"
+    hostname = "Unknown"
+    ssid = "Unknown"
+    iwag_thr = Thread.new do
+      Net::SSH.start(iwag_host, iwag_login, :password => iwag_password) do |session|
+        answ_bind = session.exec!("show ip dhcp binding #{bind_ip}")
+        regexp_main = /\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}\s{1,20}(\w{2,4}.\w{2,4}.\w{2,4}.\w{2,4})|\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}\s{1,20}(\w{4}.\w{4}.\w{4})/
+        #regexp_main = /\r\n(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\s+(\S{13,18})\s+Sep 18 2020 07:44 PM\s+Automatic\s+Active\s+Tunnel201\r\n/
+        ggg7 = answ_bind.match(regexp_main)
+        begin
+          if ggg7[1] != nil
+            mac = mac_parse(ggg7[1])
+          else
+            mac = mac_parse(ggg7[2])
+          end
+        rescue
+          mac = "Unknown"
+        end
+        regexp_remote_id = /Remote id :\s(\S{2,100})/
+        regexp_tunnel = /Active\s{2,40}(\S{2,40})|Selecting\s{2,40}(\S{2,40})/
+        regexp_curcuit_id = /Circuit id :\s(\S{2,100})/
+        ggg9 = answ_bind.match(regexp_tunnel)
+
+        begin
+          if ggg9[1] != nil
+            accessinterface = ggg9[1]
+          else
+            accessinterface = ggg9[2]
+          end
+        rescue
+          accessinterface = "Unknown"
+        end
+        ggg8 = answ_bind.match(regexp_remote_id)
+        ggg10 = answ_bind.match(regexp_curcuit_id)
+        begin
+          a1 = ggg8[1].split(":")
+          hostname = a1[0]
+          ssid = a1[1]
+        rescue
+          begin
+            if ggg8[1] != nil
+              if ggg8[1].include?("wireless_public_interface")
+                hostname = ggg10[1]
+                ssid = "Unknown"
+              else
+                hostname = ggg8[1]
+                ssid = "Unknown"
+              end
+            else
+              ssid = "Unknown"
+              hostname = "Unknown"
+            end
+          rescue
+            ssid = "Unknown"
+            hostname = "Unknown"
+          end
+        end
+      end
+    end
+    iwag_thr.join
+    {"mac": mac, "iwaginterface": accessinterface, "aphostname": hostname, "SSID": ssid}
+  end
+
+end

data/lib/imperituroard/platforms/iwag/iwag_database_worker.rb

@@ -0,0 +1,24 @@
+
+
+class IwagDbCache
+
+  attr_accessor :db_host, :db_login, :db_password
+
+  def initialize(db_host, db_login, db_password)
+    @db_host = db_host
+    @db_login = db_login
+    @db_password = db_password
+  end
+
+  def check_db_exists(ip)
+
+  end
+
+
+  def insert_new_cache()
+
+  end
+
+
+end
+

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

@@ -21,8 +21,10 @@ class InternalFunc
   end
 
   def printer_texter(text, log_level)
-    mess = {:datetime => datetimenow, :sdk => "imperituroard", :sdk_version => Imperituroard::VERSION, :message => text}
-    p mess
+    if log_level == "debug"
+      mess = {:datetime => datetimenow, :sdk => "imperituroard", :sdk_version => Imperituroard::VERSION, :message => text}
+      p mess
+    end
   end
 
   def prof_id_list_transform_mongo(id_list)
@@ -176,7 +178,7 @@ class InternalFunc
       end
     end
     out_data = res
-    printer_texter({:out_data => out_data, :inp_fun => inp_fun, :fun => "delete_key_hash" }, "debug")
+    printer_texter({:out_data => out_data, :inp_fun => inp_fun, :fun => "delete_key_hash"}, "debug")
     out_data
   end
 
@@ -191,7 +193,6 @@ class InternalFunc
   end
 
 
-
   def test()
     p "eeeeeeeeeeeeeeeeeeeeeeee"
   end

data/lib/imperituroard/projects/mhub.rb

@@ -24,19 +24,21 @@ class MhubFunctions_2
                 :static_callback,
                 :crm_connector,
                 :telegram_connector,
-                :sms_alphaname
+                :sms_alphaname,
+                :log_level
 
-  def initialize(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname)
+  def initialize(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname, log_level)
     @sk_url = sk_url_simple
     @sk_login = sk_login
     @sk_password = sk_password
+    @log_level = log_level
     @internal_func = InternalFunc.new
-    @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
+    @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id, log_level)
     @internal_func = InternalFunc.new
     @dabrab_connecter = Dabrab.new
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
     @static_callback = static_callback
-    @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
+    @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id, log_level)
     @sms_alphaname = sms_alphaname
   end
 
@@ -58,6 +60,7 @@ class MhubFunctions_2
     output_params = {}
     hub_resp = {}
     null_statement = [nil, "nil", "", "null"]
+    mes_data = {}
 
     begin
 
@@ -89,10 +92,16 @@ class MhubFunctions_2
       #   output_params = {"code": 503, "result": "Invalid recipients", "answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}
       # end
 
+      p params
       if params["destinations"].length >= 1
+        p params["destinations"]
 
+        p "eeee"
         msisdn2 = dabrab_connecter.num_formatter(params["destinations"], params["notifyUrl"].split(":")[2])
 
+        splitted_parts = msisdn2.each_slice(1).to_a
+
+
         if null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
           hub_resp = mhub_connector.sk_send_sms_list(msisdn2, static_callback, params["sms"]["text"], sms_alphaname)
         elsif !null_statement.include?(params["viber"]) && null_statement.include?(params["sms"])
@@ -104,12 +113,16 @@ class MhubFunctions_2
         else
           output_params = {"code": 502, "result": "Invalid input data st2", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
         end
+        mes_data = dabrab_connecter.send_responce_formatter(hub_resp)
+
+
       else
         output_params = {"code": 503, "result": "Invalid recipients", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
       end
 
-      mes_data = dabrab_connecter.send_responce_formatter(hub_resp)
+
       p hub_resp
+      p mes_data
 
       output_params = {"code": 200, "result": "Data processed", "body": {"answer": mes_data[:body][:mess_to_recip], "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
 
@@ -118,7 +131,61 @@ class MhubFunctions_2
       telegram_connector.telegram_message(output_params)
     end
 
-    internal_func.printer_texter({:input => input_params, :output => output_params, :hub_resp => hub_resp, :procedure => "Mhub_2.get_send_message"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :hub_resp => hub_resp, :procedure => "Mhub_2.get_send_message"}, log_level)
+    output_params
+
+  end
+
+
+  #for bank dabrabyt for massive nums
+  def get_send_message_mass_2(params, ip_src, ip_real, ip_vip)
+
+    input_params = {:params => params}
+    output_params = {}
+
+    null_statement = [nil, "nil", "", "null"]
+    mes_data_answ = []
+
+    begin
+      internal_func.printer_texter({:input => params, :procedure => "Mhub_2.get_send_message_mass_2"}, log_level)
+      if params["destinations"].length >= 1
+        msisdn2 = dabrab_connecter.num_formatter(params["destinations"], params["notifyUrl"].split(":")[2])
+        splitted_parts = msisdn2.each_slice(100).to_a
+        for part_list in splitted_parts
+
+          internal_func.printer_texter({:input => part_list, :procedure => "Mhub_2.get_send_message_mass_2"}, log_level)
+
+          hub_resp = {}
+
+          if null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
+            hub_resp = mhub_connector.sk_send_sms_list(part_list, static_callback, params["sms"]["text"], sms_alphaname)
+          elsif !null_statement.include?(params["viber"]) && null_statement.include?(params["sms"])
+            hub_resp = mhub_connector.sk_send_viber_list(part_list, static_callback, params["viber"]["text"])
+          elsif !null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
+            hub_resp = mhub_connector.sk_send_viber_sms_list(part_list, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname)
+          else
+            output_params = {"code": 502, "result": "Invalid input data st2", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+          end
+          mes_data = dabrab_connecter.send_responce_formatter(hub_resp)
+
+          internal_func.printer_texter({:input => mes_data, :procedure => "Mhub_2.get_send_message_mass_2"}, log_level)
+
+          mes_data_answ = mes_data_answ + mes_data[:body][:mess_to_recip][:messages]
+
+        end
+
+      else
+        output_params = {"code": 503, "result": "Invalid recipients", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      end
+
+      output_params = {"code": 200, "result": "Data processed", "body": {"answer": {"bulkId": "00000000-0000-0000-0000-000000000000", "messages": mes_data_answ}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+
+    rescue
+      output_params = {"code": 500, "result": "MhubFunctions_2.get_send_message_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 => {}, :procedure => "Mhub_2.get_send_message"}, log_level)
     output_params
 
   end
@@ -142,7 +209,7 @@ class MhubFunctions_2
       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"}, "debug")
+    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/sk.rb

@@ -3,12 +3,13 @@ require 'imperituroard/projects/mhub/subs/dabrab/dabrab_proced'
 
 class Sksk_2
 
-  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector, :dabrab_add_func
+  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector, :dabrab_add_func, :log_level
 
-  def initialize(sk_url, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
+  def initialize(sk_url, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id, log_level)
     @sk_url = sk_url
     @sk_login = sk_login
     @sk_password = sk_password
+    @log_level = log_level
     @internal_func = InternalFunc.new
     @sk_url_broadcast = sk_url_broadcast
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
@@ -72,7 +73,7 @@ class Sksk_2
       output_params = {:code => 500, :result => "Sksk_2.sk_send_sms_one: Something wrong", :body => {:request_message => request_message}}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_sms_one"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_sms_one"}, log_level)
     output_params
   end
 
@@ -131,12 +132,11 @@ class Sksk_2
 
       thr_sk_send_viber_one.join
 
-
     rescue
       output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_one: Something wrong"}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_one"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_one"}, log_level)
     output_params
   end
 
@@ -198,7 +198,6 @@ class Sksk_2
         else
           output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_sms_one: Something wrong with dabrabyt_text_field_parse"}
         end
-
       end
 
       thr_sk_send_viber_sms_one.join
@@ -207,7 +206,7 @@ class Sksk_2
       output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_sms_one: Something wrong"}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_sms_one"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_sms_one"}, log_level)
     output_params
 
   end
@@ -269,7 +268,7 @@ class Sksk_2
       output_params = {:code => 500, :result => "Sksk_2.sk_send_sms_list: Something wrong"}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_sms_list"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_sms_list"}, log_level)
     output_params
   end
 
@@ -332,7 +331,7 @@ class Sksk_2
       output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_list: Something wrong"}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_list"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_list"}, log_level)
     output_params
   end
 
@@ -345,6 +344,7 @@ class Sksk_2
     begin
       thr_sk_send_viber_sms_list = Thread.new do
 
+
         viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text)
 
         if viber_mess_ans[:code] == 200
@@ -359,7 +359,6 @@ class Sksk_2
 
           req.basic_auth sk_login, sk_password
 
-
           req["Content-Type"] = "application/json"
           req["Accept"] = "application/json"
 
@@ -390,20 +389,16 @@ class Sksk_2
                            :body => {:request_message => request_message,
                                      :res_code => res.code,
                                      :res_body => JSON.parse(res.body.to_s)}}
-
         else
           output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_sms_list: Something wrong with dabrabyt_text_field_parse"}
         end
-
       end
-
       thr_sk_send_viber_sms_list.join
-
     rescue
       output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_sms_list: Something wrong"}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_sms_list"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_sms_list"}, log_level)
     output_params
   end
 

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

@@ -3,11 +3,12 @@ require 'imperituroard/projects/iot/internal_functions'
 
 class Crm_2
 
-  attr_accessor :crm_callback_url, :crm_login, :crm_password, :internal_func, :telegram_connector
+  attr_accessor :crm_callback_url, :crm_login, :crm_password, :internal_func, :telegram_connector, :log_level
 
-  def initialize(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
+  def initialize(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id, log_level)
     @crm_callback_url = crm_callback_url
     @crm_login = crm_login
+    @log_level = log_level
     @crm_password = crm_password
     @internal_func = InternalFunc.new
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
@@ -44,7 +45,7 @@ class Crm_2
                          :body => {:request_message => crm_payload,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
-        p res.body
+        #p res.body
       end
       thr_crm_status_2.join
 
@@ -52,7 +53,7 @@ class Crm_2
       output_params = {:code => 500, :result => "Crm_2.crm_status_2: Something wrong", :body => {:request_message => request_message}}
       telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Crm_2.crm_status_2"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Crm_2.crm_status_2"}, log_level)
     output_params
 
   end

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

@@ -30,9 +30,9 @@ class Dabrab
       image_dat = stri.scan(regexp_image1)
 
 
-      p button_url_dat
-      p button_text_dat
-      p image_dat
+      #p button_url_dat
+      #p button_text_dat
+      #p image_dat
 
       begin
         if button_url_dat != [] && button_url_dat != nil && button_url_dat != ""
@@ -90,19 +90,20 @@ class Dabrab
         scheme = 0
       end
 
-      if scheme==0
-        sk_format = {"text": text, "ttl": 60}
-      elsif scheme==1
-        sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
-      elsif scheme==2
-        sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
-      elsif scheme==3
-        sk_format = {"img": image, "ttl": 60}
-      else
-        nil
+      case scheme
+        when 0
+          sk_format = {"text": text, "ttl": 60}
+        when 1
+          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
+        when 2
+          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
+        when 3
+          sk_format = {"img": image, "ttl": 60}
+        else
+          nil
       end
 
-      p sk_format
+      #p sk_format
 
       output_answer ={:code => 200, :result => "Success", :body => {:to_sk_format => sk_format, :button_url => button_url, :image => image, :button_text => button_text, :text => text, :scheme => scheme, :scheme_dic => scheme_dic[scheme]}}
     rescue
@@ -125,11 +126,12 @@ class Dabrab
                                          #"extra_id": extra_id
                                      })
       rescue
-        p "failed: #{g.to_s}"
+        nil
+        #p "failed: #{g.to_s}"
       end
 
     end
-    p converted_msisdn_list
+    #p converted_msisdn_list
     converted_msisdn_list
 
   end
@@ -155,8 +157,8 @@ class Dabrab
         ]
     }
 
-    p "send_responce_formatter(hub_answer)"
-    p hub_answer
+    #p "send_responce_formatter(hub_answer)"
+    #p hub_answer
 
     for a in hub_answer[:body][:res_body]["messages"]
       status1 = {}
@@ -181,7 +183,7 @@ class Dabrab
       messages_sect.append(status1)
     end
 
-    p messages_sect
+    #p messages_sect
 
     mess_to_recip = {"bulkId": "00000000-0000-0000-0000-000000000000", "messages": messages_sect}
     {:code => 200, :result => "Data processed", :body => {:mess_to_recip => mess_to_recip}}
@@ -190,8 +192,8 @@ class Dabrab
 
   def delivery_report_transform(hub_report)
 #{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber", "controller"=>"reports", "action"=>"delivery", "report"=>{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber"}}
-    p hub_report
-    p "hub_report"
+#p hub_report
+#p "hub_report"
     data_for_status = {
         23011 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by SMS",
                   :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.9"
+  VERSION = "1.1.10"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,6 +207,8 @@ files:
 - lib/imperituroard/platforms/cps/cps_multiple_thread_req.rb
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
+- lib/imperituroard/platforms/iwag/get_iwag_data.rb
+- lib/imperituroard/platforms/iwag/iwag_database_worker.rb
 - lib/imperituroard/platforms/public/telegram.rb
 - lib/imperituroard/platforms/staros/get_data_ssh.rb
 - lib/imperituroard/platforms/staros/staros_automation.rb