imperituroard 1.1.10 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a24d95016bbc1c495cb86ef3f2cbebd39bfa21
-  data.tar.gz: 647278e86d5ec1f44cf808e8c3a63f7f1c4c7b64
+  metadata.gz: 2b88a1a03fcc8ffa9b104d37fc0167bbe99b3ee9
+  data.tar.gz: 991615ca54d1e743e64955b08fff8b45ff962f5d
 SHA512:
-  metadata.gz: 74ae2cf7887f78b327956031bf5babab5ab78477b094b1f866ec6b43fd00796cf1a766cf21980507152434aafd9918917b3877f7adb62d15c7edee812c4deafa
-  data.tar.gz: 144a7e259528a7fa57a6f4f81a558e0604d1957cf294cf7479d8bfa35b896849bc216180180c6e418bc8672d031674d97d6f9c1ff729b2adbc1f37a98be66624
+  metadata.gz: 4fa2c2c4ca77e55e585cde7c0c03d3fc757b43e134691d672560ec22f6533d974882fa45364353dab46582013e75e134397059de936c217e7c572c4ed5c21ec8
+  data.tar.gz: 9415cfc431b7be26a9fab465da942b6b9c1e46205c97d1a84361b2ec93538ae7a8744d697f68a36a25e3ef169808cd5e1428c1287ff64e61cce7f6bf5b2b154b

data/.idea/runConfigurations/dabrab_proced.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="dabrab_proced" type="RubyRunConfigurationType" factoryName="Ruby">
+    <module name="imperituroard" />
+    <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/imperituroard/projects/mhub/subs/dabrab" />
+    <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+    <envs />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+      <COVERAGE_PATTERN ENABLED="true">
+        <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+      </COVERAGE_PATTERN>
+    </EXTENSION>
+    <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+    <method />
+  </configuration>
+</component>

data/.idea/runConfigurations/test9_dab.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test9_dab" type="RubyRunConfigurationType" factoryName="Ruby">
+    <module name="imperituroard" />
+    <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
+    <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+    <envs />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+      <COVERAGE_PATTERN ENABLED="true">
+        <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+      </COVERAGE_PATTERN>
+    </EXTENSION>
+    <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/test9_dab.rb" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+    <method />
+  </configuration>
+</component>

data/lib/imperituroard.rb

@@ -314,7 +314,7 @@ class Mhub_2
                 :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, 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, log_level="error")
     @sk_url = sk_url_simple
     @sk_login = sk_login
     @sk_password = sk_password
@@ -322,7 +322,7 @@ class Mhub_2
     @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, log_level)
     @internal_func = InternalFunc.new
-    @dabrab_connecter = Dabrab.new
+    @dabrab_connecter = Dabrab.new(log_level)
     @static_callback = static_callback
     @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)
@@ -341,12 +341,12 @@ 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)
+  def get_send_message_mass(params, ip_src, ip_real, ip_vip, slice_number=100, time_pause_minutes=5)
+    mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
   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)
+  def recieve_delivery_report(params, ip_src, ip_real, ip_vip, crm_slice_num)
+    mhub_connector.rec_deliv_report_2(params, ip_src, ip_real, ip_vip, crm_slice_num)
   end
 
 end

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

@@ -0,0 +1,112 @@
+require 'net-telnet'
+require 'net/ssh'
+require 'date'
+
+class CSRtelnet_1
+
+  attr_accessor :iwag1_host, :iwag_username, :iwag_password
+
+  def initialize(iwag1_host, iwag_username, iwag_password)
+    @iwag1_host = iwag1_host
+    @iwag_username = iwag_username
+    @iwag_password = iwag_password
+  end
+
+  def get_subs_mac2_1(ipaddress)
+
+    subscribers_mac = ""
+
+    #begin
+
+      dump =""
+      connection = Net::Telnet.new( "Host" => iwag1_host, "Timeout" => false, "Prompt" => /.*\#/ ) { |str| }
+      connection.login({ "Name" => iwag_username, "Password" => iwag_password, "LoginPrompt" => /Username:/ }) { |str|  }
+      connection.cmd("show ip dhcp binding #{ipaddress}") {
+          |c|
+        p c
+        dump << c
+      }
+      connection.close
+      as = dump.split("\n")
+      p as
+      reer = as[4].split(" ")
+
+      ma = reer[1].to_s.upcase
+      pos = ma[0]+ma[1]
+      if pos=="01"
+        subscribers_mac = ma[2]+ma[3]+":"+ma[5]+ma[6]+":"+ma[7]+ma[8]+":"+ma[10]+ma[11]+":"+ma[12]+ma[13]+":"+ma[15]+ma[16]
+      else
+        subscribers_mac = ma[0]+ma[1]+":"+ma[2]+ma[3]+":"+ma[5]+ma[6]+":"+ma[7]+ma[8]+":"+ma[10]+ma[11]+":"+ma[12]+ma[13]
+      end
+
+
+    #rescue
+    #  subscribers_mac = "unknown"
+    #end
+
+    return subscribers_mac
+
+  end
+
+
+  #test function. Not used
+  def get_iwag_info_ssh_1(ipaddress)
+    p DateTime.now
+    Net::SSH.start(iwag1_host, iwag_username, :password => iwag_password) do |ssh|
+      result = ssh.exec!("show ip dhcp binding #{ipaddress}\n")
+      p result
+    end
+    p DateTime.now
+  end
+
+
+
+  def return_iwag_access_interface_1(ipaddress)
+    host_iwag = iwag1_host
+    username_iwag = iwag_username
+    password_iwag = iwag_password
+    answer =""
+
+    dump =""
+    begin
+      connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*\#/) {|str| print str}
+      connection.login({"Name" => username_iwag, "Password" => password_iwag, "LoginPrompt" => /Username:/}) {|str| print str}
+      connection.cmd("show ip dhcp binding #{ipaddress}") {
+          |c|
+        dump << c
+      }
+      connection.close
+      as = dump.split("\n")
+
+      if as[4] != nil && as[3] != ""
+        access_interface = as[4].gsub!("  ", "").split(" ").last
+        return access_interface
+      else
+        answer ="false"
+        return answer
+      end
+    rescue
+      begin
+        connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*\#/) {|str| print str}
+        connection.login({"Name" => username_iwag, "Password" => password_iwag, "LoginPrompt" => /Username:/}) {|str| print str}
+        connection.cmd("show ip dhcp binding #{ipaddress}") {
+            |c|
+          dump << c
+        }
+        connection.close
+        as = dump.split("\n")
+        if as[4] != nil && as[3] != ""
+          access_interface = as[4].gsub!("  ", "").split(" ").last
+          return access_interface
+        else
+          answer ="false"
+          return answer
+        end
+      rescue
+        return "unknown"
+      end
+    end
+  end
+
+
+end

data/lib/imperituroard/projects/mhub.rb

@@ -35,7 +35,7 @@ class MhubFunctions_2
     @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, log_level)
     @internal_func = InternalFunc.new
-    @dabrab_connecter = Dabrab.new
+    @dabrab_connecter = Dabrab.new(log_level)
     @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, log_level)
@@ -92,15 +92,10 @@ 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)
@@ -120,10 +115,6 @@ class MhubFunctions_2
         output_params = {"code": 503, "result": "Invalid recipients", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
       end
 
-
-      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}}}
 
     rescue
@@ -138,7 +129,7 @@ class MhubFunctions_2
 
 
   #for bank dabrabyt for massive nums
-  def get_send_message_mass_2(params, ip_src, ip_real, ip_vip)
+  def get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
 
     input_params = {:params => params}
     output_params = {}
@@ -150,7 +141,7 @@ class MhubFunctions_2
       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
+        splitted_parts = msisdn2.each_slice(slice_number).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)
@@ -158,11 +149,11 @@ class MhubFunctions_2
           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)
+            hub_resp = mhub_connector.sk_send_sms_list(part_list, static_callback, params["sms"]["text"], sms_alphaname, time_pause_minutes)
           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"])
+            hub_resp = mhub_connector.sk_send_viber_list(part_list, static_callback, params["viber"]["text"], time_pause_minutes)
           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)
+            hub_resp = mhub_connector.sk_send_viber_sms_list(part_list, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname, time_pause_minutes)
           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
@@ -192,14 +183,14 @@ class MhubFunctions_2
 
 
   #for bank dabrabyt
-  def rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
+  def rec_deliv_report_2(params, ip_src, ip_real, ip_vip, crm_slice_num=2)
     input_params = {:params => params, :ip_src => ip_src, :ip_real => ip_real, :ip_vip => ip_vip}
     output_params = {}
     hub_resp = {}
 
     begin
       mes_report = dabrab_connecter.delivery_report_transform(params)[:body][:report_to_recip]
-      result = crm_connector.crm_status_2(mes_report)
+      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}}}
       else
@@ -213,11 +204,6 @@ class MhubFunctions_2
     output_params
   end
 
-  def test2
-    hh = Infobip_1.new
-    hh.test
-  end
-
 
 end
 

data/lib/imperituroard/projects/mhub/sk.rb

@@ -1,5 +1,6 @@
 require 'imperituroard/projects/iot/internal_functions'
 require 'imperituroard/projects/mhub/subs/dabrab/dabrab_proced'
+require 'date'
 
 class Sksk_2
 
@@ -13,10 +14,17 @@ class Sksk_2
     @internal_func = InternalFunc.new
     @sk_url_broadcast = sk_url_broadcast
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
-    @dabrab_add_func = Dabrab.new
+    @dabrab_add_func = Dabrab.new(log_level)
   end
 
 
+  def get_start_date(addit_min)
+    date_b = Time.now
+    (date_b + addit_min * 60).strftime("%Y-%m-%d %H:%M:%S")
+  end
+
+
+
   def sk_send_sms_one(msisdn, callback_url, text, alphaname)
 
     input_params = {:msisdn => msisdn, :callback_url => callback_url, :text => text, :alphaname => alphaname}
@@ -212,7 +220,7 @@ class Sksk_2
   end
 
 
-  def sk_send_sms_list(msisdn_list, callback_url, text, alphaname)
+  def sk_send_sms_list(msisdn_list, callback_url, text, alphaname, time_pause_minutes=1)
 
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :text => text, :alphaname => alphaname}
     output_params = {}
@@ -239,6 +247,7 @@ class Sksk_2
         request_message = {
             "recipients": msisdn_list,
             "callback_url": callback_url,
+            "start_time": get_start_date(time_pause_minutes),
             "tag": "Dabrab_custom_api_1",
             "channels": [
                 "sms"
@@ -273,7 +282,7 @@ class Sksk_2
   end
 
 
-  def sk_send_viber_list(msisdn_list, callback_url, text)
+  def sk_send_viber_list(msisdn_list, callback_url, text, time_pause_minutes)
 
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :text => text}
     output_params = {}
@@ -304,6 +313,7 @@ class Sksk_2
           request_message = {
               "recipients": msisdn_list,
               "callback_url": callback_url,
+              "start_time": get_start_date(time_pause_minutes),
               "tag": "Dabrab_custom_api_1",
               "channels": [
                   "viber"
@@ -336,7 +346,7 @@ class Sksk_2
   end
 
 
-  def sk_send_viber_sms_list(msisdn_list, callback_url, sms_text, viber_text, alphaname)
+  def sk_send_viber_sms_list(msisdn_list, callback_url, sms_text, viber_text, alphaname, time_pause_minutes)
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :sms_text => sms_text, :viber_text => viber_text, :alphaname => alphaname}
     output_params = {}
     request_message = {}
@@ -349,6 +359,8 @@ class Sksk_2
 
         if viber_mess_ans[:code] == 200
 
+
+
           uri = URI(sk_url_broadcast)
           #8 - client id
 
@@ -366,6 +378,7 @@ class Sksk_2
           request_message = {
               "recipients": msisdn_list,
               "callback_url": callback_url,
+              "start_time": get_start_date(time_pause_minutes),
               "tag": "Dabrab_custom_api_1",
               "channels": [
                   "viber",

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

@@ -14,7 +14,7 @@ class Crm_2
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
   end
 
-  def crm_status_2(crm_payload)
+  def crm_status_2(crm_payload, slice_num)
 
     input_params = {:crm_payload => crm_payload}
     output_params = {}
@@ -22,29 +22,50 @@ class Crm_2
 
     begin
 
+      internal_func.printer_texter({:input => "Start process", :procedure => "Crm_2.crm_status_2"}, log_level)
+
+
       thr_crm_status_2 = Thread.new do
-        uri = URI(crm_callback_url)
-        #8 - client id
 
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        partnnn = crm_payload[:results].each_slice(slice_num).to_a
+
+        partnnn.each { |one_part_reports|
+
+          crm_payload2 = {:results => one_part_reports }
+
+
+          uri = URI(crm_callback_url)
+          #8 - client id
+
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+
+          req.basic_auth crm_login, crm_password
+
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          internal_func.printer_texter({:input => {:crm_payload2 => crm_payload2}, :procedure => "Crm_2.crm_status_2"}, log_level)
+
+
+          req.body = crm_payload2.to_json
 
-        req.basic_auth crm_login, crm_password
+          internal_func.printer_texter({:input => "Before send request to crm", :procedure => "Crm_2.crm_status_2"}, log_level)
 
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
+          res = https.request(req)
 
-        req.body = crm_payload.to_json
-        res = https.request(req)
+          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)
 
+        }
 
         output_params = {:code => 200,
                          :result => "Crm_2.crm_status_2: Request processed",
                          :body => {:request_message => crm_payload,
-                                   :res_code => res.code,
-                                   :res_body => JSON.parse(res.body.to_s)}}
+                                   :res_code => "200",
+                                   :res_body => ""}}
         #p res.body
       end
       thr_crm_status_2.join

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

@@ -1,5 +1,14 @@
+require 'imperituroard/projects/iot/internal_functions'
+
 class Dabrab
 
+  attr_accessor :internal_func, :log_level
+
+  def initialize(log_level)
+    @internal_func = InternalFunc.new
+    @log_level = log_level
+  end
+
   def dabrabyt_text_field_parse(stri)
     button_url = ""
     image = ""
@@ -190,10 +199,15 @@ class Dabrab
   end
 
 
-  def delivery_report_transform(hub_report)
+  def delivery_report_transform(hub_report_in)
+
+    internal_func.printer_texter({:input => "Start delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
+
 #{"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"
+    report_to_recip = []
+
     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
@@ -218,66 +232,132 @@ class Dabrab
         } #Viber subscriber not exists
     }
 
-    if data_for_status[hub_report[:msg_status]] != nil && data_for_status[hub_report[:msg_status]] != {} && data_for_status[hub_report[:msg_status]] != [] && data_for_status[hub_report[:msg_status]] != ""
-      report_to_recip = {
-          "results": [
-              {
-
-                  "bulkId": "00000000-0000-0000-0000-000000000000",
-                  "messageId": hub_report[:report][:message_id],
-                  "to": hub_report[:report][:number],
-                  #    "sentAt": "2020-05-05T20:00:00.000+0000",
-                  #    "doneAt": "2020-05-05T20:00:00.000+0000",
-                  "status": {
-                      "groupId": data_for_status[hub_report[:msg_status]][:status_grid],
-                      "groupName": data_for_status[hub_report[:msg_status]][:status_grname],
-                      "id": data_for_status[hub_report[:msg_status]][:status_id],
-                      "name": data_for_status[hub_report[:msg_status]][:status_name],
-                      "description": data_for_status[hub_report[:msg_status]][:status_descr]
-                  },
-                  "error": {
-                      "groupId": data_for_status[hub_report[:msg_status]][:error_grid],
-                      "groupName": data_for_status[hub_report[:msg_status]][:error_grname],
-                      "id": data_for_status[hub_report[:msg_status]][:error_id],
-                      "name": data_for_status[hub_report[:msg_status]][:error_name],
-                      "description": data_for_status[hub_report[:msg_status]][:error_descr],
-                      "permanent": data_for_status[hub_report[:msg_status]][:error_permanent]
-                  }
-              }
-          ]
-      }
+    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)
+
+      hub_report = hub_report_in
+
+      if data_for_status[hub_report["msg_status"]] != nil && data_for_status[hub_report["msg_status"]] != {} && data_for_status[hub_report["msg_status"]] != [] && data_for_status[hub_report["msg_status"]] != ""
+
+        report_to_recip.push({
+
+                                 "bulkId": "00000000-0000-0000-0000-000000000000",
+                                 "messageId": hub_report["report"]["message_id"],
+                                 "to": hub_report["report"]["number"],
+                                 #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                 #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                 "status": {
+                                     "groupId": data_for_status[hub_report["msg_status"]][:status_grid],
+                                     "groupName": data_for_status[hub_report["msg_status"]][:status_grname],
+                                     "id": data_for_status[hub_report["msg_status"]][:status_id],
+                                     "name": data_for_status[hub_report["msg_status"]][:status_name],
+                                     "description": data_for_status[hub_report["msg_status"]][:status_descr]
+                                 },
+                                 "error": {
+                                     "groupId": data_for_status[hub_report["msg_status"]][:error_grid],
+                                     "groupName": data_for_status[hub_report["msg_status"]][:error_grname],
+                                     "id": data_for_status[hub_report["msg_status"]][:error_id],
+                                     "name": data_for_status[hub_report["msg_status"]][:error_name],
+                                     "description": data_for_status[hub_report["msg_status"]][:error_descr],
+                                     "permanent": data_for_status[hub_report["msg_status"]][:error_permanent]
+                                 }
+                             })
+
+
+      else
+
+        report_to_recip.push({
+
+                                 "bulkId": "00000000-0000-0000-0000-000000000000",
+                                 "messageId": hub_report["report"]["message_id"],
+                                 "to": hub_report["report"]["number"],
+                                 #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                 #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                 "status": {
+                                     "groupId": 2,
+                                     "groupName": "UNDELIVERABLE_NOT_DELIVERED",
+                                     "id": 9,
+                                     "name": "UNDELIVERED",
+                                     "description": "Unknown error"
+                                 },
+                                 "error": {
+                                     "groupId": 1,
+                                     "groupName": "HANDSET_ERRORS",
+                                     "id": 32,
+                                     "name": "EC_SM_DELIVERY_FAILURE",
+                                     "description": "Unknown error",
+                                     "permanent": false
+                                 }
+                             })
+
+      end
 
     else
 
-      report_to_recip = {
-          "results": [
-              {
-
-                  "bulkId": "00000000-0000-0000-0000-000000000000",
-                  "messageId": hub_report[:report][:message_id],
-                  "to": hub_report[:report][:number],
-                  #    "sentAt": "2020-05-05T20:00:00.000+0000",
-                  #    "doneAt": "2020-05-05T20:00:00.000+0000",
-                  "status": {
-                      "groupId": 2,
-                      "groupName": "UNDELIVERABLE_NOT_DELIVERED",
-                      "id": 9,
-                      "name": "UNDELIVERED",
-                      "description": "Unknown error"
-                  },
-                  "error": {
-                      "groupId": 1,
-                      "groupName": "HANDSET_ERRORS",
-                      "id": 32,
-                      "name": "EC_SM_DELIVERY_FAILURE",
-                      "description": "Unknown error",
-                      "permanent": false
-                  }
-              }
-          ]
+      hub_report_in["_json"].each {|hub_report2|
+
+        internal_func.printer_texter({:input => "Start Mass message delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
+
+        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"]] != ""
+          report_to_recip.push({
+
+                                   "bulkId": "00000000-0000-0000-0000-000000000000",
+                                   "messageId": hub_report2["message_id"],
+                                   "to": hub_report2["number"],
+                                   #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                   #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                   "status": {
+                                       "groupId": data_for_status[hub_report2["msg_status"]][:status_grid],
+                                       "groupName": data_for_status[hub_report2["msg_status"]][:status_grname],
+                                       "id": data_for_status[hub_report2["msg_status"]][:status_id],
+                                       "name": data_for_status[hub_report2["msg_status"]][:status_name],
+                                       "description": data_for_status[hub_report2["msg_status"]][:status_descr]
+                                   },
+                                   "error": {
+                                       "groupId": data_for_status[hub_report2["msg_status"]][:error_grid],
+                                       "groupName": data_for_status[hub_report2["msg_status"]][:error_grname],
+                                       "id": data_for_status[hub_report2["msg_status"]][:error_id],
+                                       "name": data_for_status[hub_report2["msg_status"]][:error_name],
+                                       "description": data_for_status[hub_report2["msg_status"]][:error_descr],
+                                       "permanent": data_for_status[hub_report2["msg_status"]][:error_permanent]
+                                   }
+                               })
+
+
+        else
+
+          report_to_recip.push({
+
+                                   "bulkId": "00000000-0000-0000-0000-000000000000",
+                                   "messageId": hub_report2["message_id"],
+                                   "to": hub_report2["number"],
+                                   #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                   #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                   "status": {
+                                       "groupId": 2,
+                                       "groupName": "UNDELIVERABLE_NOT_DELIVERED",
+                                       "id": 9,
+                                       "name": "UNDELIVERED",
+                                       "description": "Unknown error"
+                                   },
+                                   "error": {
+                                       "groupId": 1,
+                                       "groupName": "HANDSET_ERRORS",
+                                       "id": 32,
+                                       "name": "EC_SM_DELIVERY_FAILURE",
+                                       "description": "Unknown error",
+                                       "permanent": false
+                                   }
+                               })
+        end
+
       }
     end
-    {:code => 200, :result => "Data processed", :body => {:report_to_recip => report_to_recip}}
+
+    {:code => 200, :result => "Data processed", :body => {:report_to_recip => {"results": report_to_recip}}}
   end
 
 end

data/lib/imperituroard/projects/wttx/updatepostcps.rb

@@ -45,25 +45,25 @@ class StateWTTX
     http = Net::HTTP.new(uri.host, uri.port)
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     p content = response.body
-    p resultcode = response.to_s.include?("OK")
+    p result_code = response.to_s.include?("OK")
     #Rails.logger = Logger.new(STDOUT)
     #logger.info "WTTX service getrestCPS result code: #{response.to_s}"
     #logger.info "WTTX service getrestCPS soap body: #{content.to_s}"
 
 
 
-    if resultcode == false
+    if !result_code
       "false"
     else
-      regimsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
-      regimei = /<field code=\"imei\" value=\"([0-9]{10,17})\"/
+      reg_imsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
+      reg_imei = /<field code=\"imei\" value=\"([0-9]{10,17})\"/
 
-      m1 = regimsi.match(content)
-      m2 = regimei.match(content)
+      m1 = reg_imsi.match(content)
+      m2 = reg_imei.match(content)
       imsi = m1[1]
       imei = m2[1]
 
-      res = resultcode.to_s + " " + imsi + " " + imei
+      res = result_code.to_s + " " + imsi + " " + imei
       p res
       res
     end

data/lib/imperituroard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.15
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
@@ -187,7 +187,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".idea/runConfigurations/autovpn.xml"
+- ".idea/runConfigurations/dabrab_proced.xml"
 - ".idea/runConfigurations/hua_oceanconnect_adapter.xml"
+- ".idea/runConfigurations/test9_dab.xml"
 - ".idea/runConfigurations/version.xml"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -209,6 +211,7 @@ files:
 - 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/iwag/iwag_telnet_connector.rb
 - lib/imperituroard/platforms/public/telegram.rb
 - lib/imperituroard/platforms/staros/get_data_ssh.rb
 - lib/imperituroard/platforms/staros/staros_automation.rb